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

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:

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()