From: Joerg Jaspert Date: Fri, 11 May 2012 19:46:56 +0000 (+0200) Subject: Merge remote-tracking branch 'ansgar/pu/wheezy' into merge X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=dfb9c4b902ab992e102d5496a2ef2c1e2442b742;hp=3dd1a5c09531a04c177f047200c6f173fb0c0480;p=dak.git Merge remote-tracking branch 'ansgar/pu/wheezy' into merge * ansgar/pu/wheezy: Change how compression methods are selected in FileWriter Use with statement instead of temporary table Move "import utils" into function Signed-off-by: Joerg Jaspert --- diff --git a/dak/new_security_install.py b/dak/new_security_install.py index 026dcced..353f8859 100755 --- a/dak/new_security_install.py +++ b/dak/new_security_install.py @@ -188,9 +188,11 @@ def main(): acceptfilename="%s/COMMENTS/ACCEPT.%s_%s" % (os.path.dirname(os.path.abspath(changes[0])), dbchange.source, version) acceptfiles[acceptfilename]=1 + print "Would create %s now and then go on to accept this package, if you allow me to." % (acceptfiles.keys()) if Options["No-Action"]: - print "Would create %s now and then go on to accept this package, but No-Action is set" % (acceptfiles.keys()) sys.exit(0) + else: + raw_input("Press Enter to continue") for acceptfilename in acceptfiles.keys(): accept_file = file(acceptfilename, "w")