X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fnew_security_install.py;h=08ccbc748e19fb325b2e03e0790a02ce893d629c;hb=ec257c02a5d62fd27844c70814acd9616b24b4c8;hp=a408c1e37eb0c74e598cc479cb97ffd3bb8ef42f;hpb=61512330fd3e7c5525fae44d31fb2869bcab066e;p=dak.git diff --git a/dak/new_security_install.py b/dak/new_security_install.py index a408c1e3..08ccbc74 100755 --- a/dak/new_security_install.py +++ b/dak/new_security_install.py @@ -120,14 +120,14 @@ def main(): global Options, Logger, Queue, changes cnf = Config() - Arguments = [('h', "help", "Security::Options::Help"), - ('n', "no-action", "Security::Options::No-Action"), - ('c', 'changesfile', "Security::Options::Changesfile"), - ('s', "sudo", "Security-Install::Options::Sudo"), - ('A', "approve", "Security-Install::Options::Approve") + Arguments = [('h', "Help", "Security::Options::Help"), + ('n', "No-Action", "Security::Options::No-Action"), + ('c', 'Changesfile', "Security::Options::Changesfile"), + ('s', "Sudo", "Security::Options::Sudo"), + ('A', "Approve", "Security::Options::Approve") ] - for i in ["help", "no-action", "changesfile", "sudo", "approve"]: + for i in ["Help", "No-Action", "Changesfile", "Sudo", "Approve"]: if not cnf.has_key("Security::Options::%s" % (i)): cnf["Security::Options::%s" % (i)] = "" @@ -168,7 +168,10 @@ def main(): # Yes, we could do this inside do_Approve too. But this way we see who exactly # called it (ownership of the file) dbchange=get_dbchange(os.path.basename(changes[0]), session) - acceptfilename="%s/COMMENTS/ACCEPT.%s_%s" % (os.path.dirname(os.path.abspath(changes[0])), dbchange.source, dbchange.version) + # strip epoch from version + version=dbchange.version + version=version[(version.find(':')+1):] + acceptfilename="%s/COMMENTS/ACCEPT.%s_%s" % (os.path.dirname(os.path.abspath(changes[0])), dbchange.source, version) if Options["No-Action"]: print "Would create %s now and then go on to accept this package, but No-Action is set" % (acceptfilename) sys.exit(0)