Merge branch 'master' into dbtests

[dak.git] / dak / new_security_install.py

diff --git a/dak/new_security_install.py b/dak/new_security_install.py
index 8ef994d460ee66fc06235e1548f2b68bb86fc4c8..08ccbc748e19fb325b2e03e0790a02ce893d629c 100755 (executable)
--- a/dak/new_security_install.py
+++ b/dak/new_security_install.py
@@ -123,8 +123,8 @@ def main():
     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")
+                 ('s', "Sudo", "Security::Options::Sudo"),
+                 ('A', "Approve", "Security::Options::Approve")
                  ]
 
     for i in ["Help", "No-Action", "Changesfile", "Sudo", "Approve"]:
@@ -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)