Skip to content

Commit 793d9ec

Browse files
- create submit requests with correct revisions when target is not link target and a service is used. We had missing service files so far after request accept.
1 parent d890468 commit 793d9ec

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

osc/commandline.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1072,18 +1072,17 @@ def do_submitrequest(self, subcmd, opts, *args):
10721072
rev=opts.revision
10731073
if not rev:
10741074
# get _link info from server, that knows about the local state ...
1075-
u = makeurl(apiurl, ['source', src_project, src_package])
1075+
u = makeurl(apiurl, ['source', src_project, src_package], query="expand=1")
10761076
f = http_GET(u)
10771077
root = ET.parse(f).getroot()
10781078
linkinfo = root.find('linkinfo')
1079-
if linkinfo != None:
1080-
if linkinfo.get('error'):
1081-
print "Package source is a broken source link."
1082-
sys.exit("Please fix this first")
1079+
if linkinfo == None:
1080+
rev=root.get('rev')
1081+
else:
10831082
if linkinfo.get('project') != dst_project or linkinfo.get('package') != dst_package:
10841083
# the submit target is not link target. use merged md5sum references to avoid not mergable
10851084
# sources when multiple request from same source get created.
1086-
rev=linkinfo.get('xsrcmd5')
1085+
rev=root.get('srcmd5')
10871086

10881087
rdiff = None
10891088
if opts.diff or not opts.message:

0 commit comments

Comments
 (0)