From af7ff0f2ad695cda6e8413e8e4029e9be191a771 Mon Sep 17 00:00:00 2001 From: Marcus Huewe Date: Fri, 17 Sep 2010 23:03:29 +0200 Subject: [PATCH] - request_interactive_review: added "(s)kip" option to skip the current request --- osc/commandline.py | 5 +---- osc/core.py | 5 ++++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/osc/commandline.py b/osc/commandline.py index 5ac92f0b..0e119139 100644 --- a/osc/commandline.py +++ b/osc/commandline.py @@ -1756,10 +1756,7 @@ Please submit there instead, or use --nodevelproject to force direct submission. for result in results: 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: - try: - request_interactive_review(apiurl, result) - except oscerr.UserAbort: - pass + request_interactive_review(apiurl, result) else: print result.list_view() else: diff --git a/osc/core.py b/osc/core.py index 9e2a0883..b93b2667 100644 --- a/osc/core.py +++ b/osc/core.py @@ -5443,7 +5443,7 @@ def request_interactive_review(apiurl, request): print request.__str__().encode('ascii', 'xmlcharrefreplace') print_request(request) 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': msg = 'd(i)ff/%s' % msg while True: @@ -5480,6 +5480,9 @@ def request_interactive_review(apiurl, request): tmpfile.flush() run_editor(tmpfile.name) print_request(request) + elif repl == 's': + print >>sys.stderr, 'skipping: #%d' % request.reqid + break elif repl == 'c': print >>sys.stderr, 'Aborting' raise oscerr.UserAbort()