mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-02-27 12:42:12 +01:00
Code

Merge branch 'fix__submit_request_id_return' of https://github.com/marcus-h/osc

Browse Source 
Only return request ids in Osc._submit_request in order to avoid a
TypeError in the caller when processing the results.
This commit is contained in:
Marcus Huewe 2020-12-22 16:06:37 +01:00
commit e06c633798
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
osc/commandline.py
View File

@ -1623,10 +1623,11 @@ Please submit there instead, or use --nodevelproject to force direct submission.
reqs = get_request_list(apiurl, dst_project, dst_package, req_type='submit', req_state=['new', 'review'])
user = conf.get_apiurl_usr(apiurl)
myreqs = [ i for i in reqs if i.state.who == user and i.reqid != opts.supersede ]
myreq_ids = [r.reqid for r in myreqs]
repl = 'y'
if len(myreqs) > 0 and not opts.yes:
print('You already created the following submit request: %s.' % \
', '.join([i.reqid for i in myreqs ]))
', '.join(myreq_ids))
repl = raw_input('Supersede the old requests? (y/n/c) ')
if repl.lower() == 'c':
print('Aborting', file=sys.stderr)
@ -1637,10 +1638,10 @@ Please submit there instead, or use --nodevelproject to force direct submission.
actionxml = """<action type="submit"> <source project="%s" package="%s" rev="%s"/> <target project="%s" package="%s"/> %s </action>""" % \
(src_project, src_package, opts.revision or show_upstream_rev(apiurl, src_project, src_package), dst_project, dst_package, options_block)
if opts.supersede:
myreqs.append(opts.supersede)
myreq_ids.append(opts.supersede)
#print 'created request id', result
return actionxml, myreqs
return actionxml, myreq_ids
def _delete_request(self, args, opts):
if len(args) < 1: