1
0
mirror of https://github.com/openSUSE/osc.git synced 2024-12-30 19:56:14 +01:00

- fixed #577792 ("osc sr: revoke-existing inquiry not accurate")

This commit is contained in:
Marcus Huewe 2010-02-08 20:16:03 +01:00
parent 0e671743bd
commit b773977410

View File

@ -876,7 +876,10 @@ Please submit there instead, or use --nodevelproject to force direct submission.
if len(myreqs) > 0: if len(myreqs) > 0:
print 'You already created the following submit request: %s.' % \ print 'You already created the following submit request: %s.' % \
', '.join([str(i.reqid) for i in myreqs ]) ', '.join([str(i.reqid) for i in myreqs ])
repl = raw_input('Revoke the old requests? (y/N) ') repl = raw_input('Revoke the old requests? (y/n/c) ')
if repl.lower() == 'c':
print >>sys.stderr, 'Aborting'
sys.exit(1)
if not opts.message: if not opts.message:
difflines = [] difflines = []
@ -896,7 +899,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
src_project, src_package, src_project, src_package,
dst_project, dst_package, dst_project, dst_package,
opts.message, orev=opts.revision, src_update=src_update) opts.message, orev=opts.revision, src_update=src_update)
if repl == 'y': if repl.lower() == 'y':
for req in myreqs: for req in myreqs:
change_request_state(apiurl, str(req.reqid), 'superseded', change_request_state(apiurl, str(req.reqid), 'superseded',
'superseded by %s' % result, result) 'superseded by %s' % result, result)