X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fnew_security_install.py;h=866184b4e6d05e29663ed577c681b954bfe6b427;hb=4dfe373de09c1f47bdd93c62b1dba6d7c5388b56;hp=3de9823eabfb2076ced37c5c0d0aff61ad0cc778;hpb=600cebaebfe47fd91d74345fc3f377a2dcc0b590;p=dak.git

diff --git a/dak/new_security_install.py b/dak/new_security_install.py
index 3de9823e..866184b4 100755
--- a/dak/new_security_install.py
+++ b/dak/new_security_install.py
@@ -91,15 +91,16 @@ def _do_Approve():
     spawn("dak process-policy unembargoed")
     newstage=get_policy_queue('newstage')
 
-    # 2. sync the stuff to ftpmaster
-    print "Sync stuff for upload to ftpmaster"
-    spawn("rsync -a -q %s/. /srv/queued/ftpmaster/." % (newstage.path))
-
     print "Locking unchecked"
     lockfile='/srv/security-master.debian.org/lock/unchecked.lock'
-    spawn("lockfile -r8 {0}".format(lockfile))
+    spawn("lockfile -r42 {0}".format(lockfile))
 
     try:
+
+        # 2. sync the stuff to ftpmaster
+        print "Sync stuff for upload to ftpmaster"
+        spawn("rsync -a -q %s/. /srv/queued/ftpmaster/." % (newstage.path))
+
         # 3. Now run process-upload in the newstage dir
         print "Now put it into the security archive"
         spawn("dak process-upload -a -d %s" % (newstage.path))
@@ -142,9 +143,9 @@ def main():
         if not cnf.has_key("Security::Options::%s" % (i)):
             cnf["Security::Options::%s" % (i)] = ""
 
-    changes_files = apt_pkg.ParseCommandLine(cnf.Cnf, Arguments, sys.argv)
+    changes_files = apt_pkg.parse_commandline(cnf.Cnf, Arguments, sys.argv)
 
-    Options = cnf.SubTree("Security::Options")
+    Options = cnf.subtree("Security::Options")
     if Options['Help']:
         usage()