mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2024-11-10 06:46:15 +01:00
Code

- reqid is a str (now)

Browse Source
This commit is contained in:
Marcus Huewe 2010-12-30 13:28:11 +01:00
parent 40d1c58e1d
commit 875fd86a31
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
osc/commandline.py
View File

@ -976,7 +976,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
if len(myreqs) > 0:
print 'There are already following submit request: %s.' % \
', '.join([str(i.reqid) for i in myreqs ])
', '.join([i.reqid for i in myreqs ])
repl = raw_input('Supersede the old requests? (y/n/c) ')
if repl.lower() == 'c':
print >>sys.stderr, 'Aborting'
@ -1002,7 +1002,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
opts.message, orev=opts.revision, src_update=src_update)
if repl.lower() == 'y':
for req in myreqs:
change_request_state(apiurl, str(req.reqid), 'superseded',
change_request_state(apiurl, req.reqid, 'superseded',
'superseded by %s' % result, result)
if opts.supersede:
@ -1176,7 +1176,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
repl = ''
if len(myreqs) > 0:
print 'You already created the following submit request: %s.' % \
', '.join([str(i.reqid) for i in myreqs ])
', '.join([i.reqid for i in myreqs ])
repl = raw_input('Supersede the old requests? (y/n/c) ')
if repl.lower() == 'c':
print >>sys.stderr, 'Aborting'
@ -1186,7 +1186,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
(src_project, src_package, opts.revision or show_upstream_rev(apiurl, src_project, src_package), dst_project, dst_package, options_block)
if repl.lower() == 'y':
for req in myreqs:
change_request_state(apiurl, str(req.reqid), 'superseded',
change_request_state(apiurl, req.reqid, 'superseded',
'superseded by %s' % result, result)
if opts.supersede:
@ -1807,7 +1807,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
for result in results:
print result.reqid, ": ",
r = change_request_state(apiurl,
str(result.reqid), 'accepted', opts.message or '')
result.reqid, 'accepted', opts.message or '')
print 'Result of change request state: %s' % r
else:
print >>sys.stderr, 'Aborted...'

6
osc/core.py
View File

@ -5844,7 +5844,7 @@ def request_interactive_review(apiurl, request):
run_editor(tmpfile.name)
print_request(request)
elif repl == 's':
print >>sys.stderr, 'skipping: #%d' % request.reqid
print >>sys.stderr, 'skipping: #%s' % request.reqid
break
elif repl == 'c':
print >>sys.stderr, 'Aborting'
@ -5876,9 +5876,9 @@ def request_interactive_review(apiurl, request):
else:
msg = msg.strip('\'').strip('"')
if state is None:
clone_request(apiurl, str(request.reqid), msg)
clone_request(apiurl, request.reqid, msg)
else:
change_request_state(apiurl, str(request.reqid), state, msg)
change_request_state(apiurl, request.reqid, state, msg)
break
finally:
if tmpfile is not None: