From ebc341e7b17a9a05056e1ee1157231a7eb29eb16 Mon Sep 17 00:00:00 2001 From: Marcus Huewe Date: Tue, 20 Apr 2010 15:29:18 +0200 Subject: [PATCH] - only offer "d(i)ff" option for submitrequests --- osc/core.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/osc/core.py b/osc/core.py index 09da7b01..fba6d938 100644 --- a/osc/core.py +++ b/osc/core.py @@ -4632,12 +4632,12 @@ def request_interactive_review(apiurl, request): tmpfile = None print request try: + msg = '(a)ccept/(d)ecline/(r)evoke/(c)ancel > ' + if request.actions[0].type == 'submit': + msg = 'd(i)ff/%s' % msg while True: - repl = raw_input('d(i)ff/(a)ccept/(d)ecline/(r)evoke/(c)ancel > ') - if repl == 'i': - if request.actions[0].type != 'submit': - print >>sys.stderr, 'diff is not possible for request type: \'%s\'' % request.actions[0].type - continue + repl = raw_input(msg) + if repl == 'i' and request.actions[0].type == 'submit': if tmpfile is None: tmpfile = tempfile.NamedTemporaryFile() tmpfile.write(server_diff(apiurl, request.actions[0].dst_project, request.actions[0].dst_package, None,