From: Joerg Jaspert Date: Thu, 7 Jun 2012 20:15:52 +0000 (+0200) Subject: first get the lockfile, then sync to ftpmaster. and wait longer for it X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=53dc3cd37e5d6676776cf110a70edff9c46072d9;p=dak.git first get the lockfile, then sync to ftpmaster. and wait longer for it Signed-off-by: Joerg Jaspert --- diff --git a/dak/new_security_install.py b/dak/new_security_install.py index 353f8859..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))