From 6b10a47fbcc631ad4ff1ef366794d21aeae299fa Mon Sep 17 00:00:00 2001 From: Marcus Huewe Date: Tue, 30 Mar 2010 00:31:01 +0200 Subject: [PATCH] - only allow --diff for submit requests --- osc/commandline.py | 4 +++- osc/core.py | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/osc/commandline.py b/osc/commandline.py index ada14ae4..d83d1945 100644 --- a/osc/commandline.py +++ b/osc/commandline.py @@ -1236,7 +1236,9 @@ Please submit there instead, or use --nodevelproject to force direct submission. else: print r # fixme: will inevitably fail if the given target doesn't exist - if opts.diff: + if opts.diff and r.actions[0].type != 'submit': + raise oscerr.WrongOptions('\'--diff\' is not possible for request type: \'%s\'' % r.actions[0].type) + elif opts.diff: try: print server_diff(conf.config['apiurl'], r.actions[0].dst_project, r.actions[0].dst_package, None, diff --git a/osc/core.py b/osc/core.py index f6c451f2..55a7daf9 100644 --- a/osc/core.py +++ b/osc/core.py @@ -4636,6 +4636,9 @@ def request_interactive_review(apiurl, request): 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 if tmpfile is None: tmpfile = tempfile.NamedTemporaryFile() tmpfile.write(server_diff(apiurl, request.actions[0].dst_project, request.actions[0].dst_package, None,