Merge branch 'dbtests' of ftp-master.debian.org:public_html/dak into dbtests

[dak.git] / dak / new_security_install.py

diff --git a/dak/new_security_install.py b/dak/new_security_install.py
index 894759631073fd367b3e10b4fdb7763308f31041..08ccbc748e19fb325b2e03e0790a02ce893d629c 100755 (executable)
--- a/dak/new_security_install.py
+++ b/dak/new_security_install.py
@@ -78,7 +78,7 @@ def spawn(command):
 def sudo(arg, fn, exit):
     if Options["Sudo"]:
         os.spawnl(os.P_WAIT, "/usr/bin/sudo", "/usr/bin/sudo", "-u", "dak", "-H",
-                  "/usr/local/bin/dak", "new-security-install", "-"+arg, "--", advisory)
+                  "/usr/local/bin/dak", "new-security-install", "-"+arg)
     else:
         fn()
     if exit:
@@ -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,13 @@ 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(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)
     accept_file = file(acceptfilename, "w")
     accept_file.write("OK\n")
     accept_file.close()