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 0fd13983f0c327b3d836221c6da4b4e5e09af4e0..08ccbc748e19fb325b2e03e0790a02ce893d629c 100755 (executable)
--- a/dak/new_security_install.py
+++ b/dak/new_security_install.py
@@ -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)