From: Joerg Jaspert <joerg@debian.org>
Date: Sat, 7 Jul 2012 19:15:30 +0000 (+0200)
Subject: Merge remote-tracking branch 'ansgar/pu/multiarchive-1' into merge
X-Git-Url: https://git.decadent.org.uk/gitweb/?p=dak.git;a=commitdiff_plain;h=4174286376153578f1444aa0afcfa2b5bfe1fe61;hp=d30a62697b78f2e98c0d62c43c61880948ce9438

Merge remote-tracking branch 'ansgar/pu/multiarchive-1' into merge

* ansgar/pu/multiarchive-1:
  Drop column origin_server from archive table.
  Reference archive table from suite and add path to archive root
  typo: "pakcages" → "packages"
  Also import re_bin_only_nmu from daklib.regexes
  don't require all binaries to be included
  use discard instead of remove
  Add module to process policy queue uploads.
  Add module with pre-acceptance tests.
  Add module to handle archive manipulation.
  Add module to handle uploads not yet installed to the archive.
  process-unchecked.new: drop __SUMMARY__ for now
  remove two template variables
  utils.py: add call_editor function
  utils (send_message): add option to write mail to files
  utils.py (mail_addresses_for_upload): only try to use address from key if there is one

Signed-off-by: Joerg Jaspert <joerg@debian.org>
---

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))
diff --git a/dak/queue_report.py b/dak/queue_report.py
index a3b59738..9de1f545 100755
--- a/dak/queue_report.py
+++ b/dak/queue_report.py
@@ -370,6 +370,7 @@ RRA:MAX:0.5:288:795
 def process_changes_files(changes_files, type, log, rrd_dir):
     msg = ""
     cache = {}
+    unprocessed = []
     # Read in all the .changes files
     for filename in changes_files:
         try:
@@ -383,6 +384,9 @@ def process_changes_files(changes_files, type, log, rrd_dir):
     # Divide the .changes into per-source groups
     per_source = {}
     for filename in cache.keys():
+	if not cache[filename].has_key("source"):
+            unprocessed.append(filename)
+            continue
         source = cache[filename]["source"]
         if not per_source.has_key(source):
             per_source[source] = {}
@@ -601,6 +605,12 @@ def process_changes_files(changes_files, type, log, rrd_dir):
             print "%s %s source package%s / %s %s package%s in total." % (source_count, type, plural(source_count), total_count, type, plural(total_count))
             print
 
+        if len(unprocessed):
+            print "UNPROCESSED"
+            print "-----------"
+            for u in unprocessed:
+                print u
+            print
 
 ################################################################################
 
diff --git a/scripts/debian/rrd-release-freeze-dates b/scripts/debian/rrd-release-freeze-dates
index 7981e51a..457e2336 100644
--- a/scripts/debian/rrd-release-freeze-dates
+++ b/scripts/debian/rrd-release-freeze-dates
@@ -1,3 +1,4 @@
 VRULE:1234691928#632a5b:lenny release
 VRULE:1281102258#0b19c1:squeeze freeze
 VRULE:1296908977#0b19c1:squeeze release
+VRULE:1341078720#00ff00:wheezy freeze