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

- request_interactive_review: added "(s)kip" option to skip the current request

Browse Source
This commit is contained in:
Marcus Huewe 2010-09-17 23:03:29 +02:00
parent de8b33f29d
commit af7ff0f2ad
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osc/commandline.py
View File

@ -1756,10 +1756,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
for result in results: for result in results:
if days == 0 or result.state.when > since or result.state.name == 'new': if days == 0 or result.state.when > since or result.state.name == 'new':
if (opts.interactive or conf.config['request_show_interactive']) and not opts.non_interactive: if (opts.interactive or conf.config['request_show_interactive']) and not opts.non_interactive:
try:
request_interactive_review(apiurl, result) request_interactive_review(apiurl, result)
except oscerr.UserAbort:
pass
else: else:
print result.list_view() print result.list_view()
else: else:

5
osc/core.py
View File

@ -5443,7 +5443,7 @@ def request_interactive_review(apiurl, request):
print request.__str__().encode('ascii', 'xmlcharrefreplace') print request.__str__().encode('ascii', 'xmlcharrefreplace')
print_request(request) print_request(request)
try: try:
msg = '(a)ccept/(d)ecline/(r)evoke/(b)uildstatus/(c)ancel > ' msg = '(a)ccept/(d)ecline/(r)evoke/(b)uildstatus/(s)kip/(c)ancel > '
if request.actions[0].type == 'submit': if request.actions[0].type == 'submit':
msg = 'd(i)ff/%s' % msg msg = 'd(i)ff/%s' % msg
while True: while True:
@ -5480,6 +5480,9 @@ def request_interactive_review(apiurl, request):
tmpfile.flush() tmpfile.flush()
run_editor(tmpfile.name) run_editor(tmpfile.name)
print_request(request) print_request(request)
elif repl == 's':
print >>sys.stderr, 'skipping: #%d' % request.reqid
break
elif repl == 'c': elif repl == 'c':
print >>sys.stderr, 'Aborting' print >>sys.stderr, 'Aborting'
raise oscerr.UserAbort() raise oscerr.UserAbort()