From b2493a25ae211f66356d65da67204ad757737de6 Mon Sep 17 00:00:00 2001 From: Marcus Huewe Date: Fri, 15 Nov 2013 11:39:21 +0100 Subject: [PATCH] - fix for 6a36b5180a22f338d728cbaa5eed44884506632b It is ridiculous that we have duplicated code for "osc sr" and "osc createrequest"... --- osc/commandline.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/osc/commandline.py b/osc/commandline.py index 269dc9ed..853afe4a 100644 --- a/osc/commandline.py +++ b/osc/commandline.py @@ -1096,7 +1096,7 @@ class Osc(cmdln.Cmdln): f = http_GET(u) root = ET.parse(f).getroot() value = root.findtext('attribute/value') - if value: + if value and not opts.yes: repl = '' print('\n\nThere are already following submit request: %s.' % \ ', '.join([str(i) for i in myreqs ])) @@ -1410,7 +1410,7 @@ Please submit there instead, or use --nodevelproject to force direct submission. user = conf.get_apiurl_usr(apiurl) myreqs = [ i for i in reqs if i.state.who == user ] repl = 'y' - if len(myreqs) > 0 and not opts.yes: + if len(myreqs) > 0: print('You already created the following submit request: %s.' % \ ', '.join([i.reqid for i in myreqs ])) repl = raw_input('Supersede the old requests? (y/n/c) ')