mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-08-23 22:58:53 +02:00
Code Activity

Merge branch 'master' of git://gitorious.org/opensuse/osc

Browse Source
This commit is contained in:
Marcus Huewe
2010-02-18 14:21:17 +01:00
parent 1510533358 57a8533ee8
commit a5a4f6da7a
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@@ -6,6 +6,7 @@
- osc remotebuildlog supports a buildlogurl - osc remotebuildlog supports a buildlogurl
- Allow --prefer-pkgs to parse repodata - Allow --prefer-pkgs to parse repodata
- new "osc build --no-service" option to skip source service update - new "osc build --no-service" option to skip source service update
- fix linktobranch apiurl usage
0.125 0.125
- add "osc pull" command to fetch and merge changes in the link target - add "osc pull" command to fetch and merge changes in the link target

4
osc/commandline.py
View File

@@ -1344,8 +1344,8 @@ Please submit there instead, or use --nodevelproject to force direct submission.
# execute # execute
link_to_branch(apiurl, project, package) link_to_branch(apiurl, project, package)
if update_local_dir: if update_local_dir:
pac = findpacs(wd)[0] pac = Package(wd)
pac.update() pac.update(rev=pac.latest_rev())
@cmdln.option('-C', '--cicount', choices=['add', 'copy', 'local'], @cmdln.option('-C', '--cicount', choices=['add', 'copy', 'local'],

2
osc/core.py
View File

@@ -3117,7 +3117,7 @@ def link_to_branch(apiurl, project, package):
convert a package with a _link + project.diff to a branch convert a package with a _link + project.diff to a branch
""" """
if '_link' in meta_get_filelist(conf.config['apiurl'], project, package): if '_link' in meta_get_filelist(apiurl, project, package):
u = makeurl(apiurl, ['source', project, package], 'cmd=linktobranch') u = makeurl(apiurl, ['source', project, package], 'cmd=linktobranch')
http_POST(u) http_POST(u)
else: else: