diff --git a/NEWS b/NEWS index 6dfb199d..67e53883 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,7 @@ - osc remotebuildlog supports a buildlogurl - Allow --prefer-pkgs to parse repodata - new "osc build --no-service" option to skip source service update + - fix linktobranch apiurl usage 0.125 - add "osc pull" command to fetch and merge changes in the link target diff --git a/osc/commandline.py b/osc/commandline.py index 36f9c679..d2888659 100644 --- a/osc/commandline.py +++ b/osc/commandline.py @@ -1344,8 +1344,8 @@ Please submit there instead, or use --nodevelproject to force direct submission. # execute link_to_branch(apiurl, project, package) if update_local_dir: - pac = findpacs(wd)[0] - pac.update() + pac = Package(wd) + pac.update(rev=pac.latest_rev()) @cmdln.option('-C', '--cicount', choices=['add', 'copy', 'local'], diff --git a/osc/core.py b/osc/core.py index 93b0122e..cf2f60cb 100644 --- a/osc/core.py +++ b/osc/core.py @@ -3117,7 +3117,7 @@ def link_to_branch(apiurl, project, package): 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') http_POST(u) else: