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

* ansgar/pu/multiarchive-1:
  config.py: Add __contains__ method
  fstransactions.py: allow mode to be a string
  fstransactions.py: also use mode for directories
  tests: add a few packages for testing dak
  utils.py: add mail_addresses_for_upload function
  gpg_get_key_addresses: return a list instead of a set
  textutils.py: don't try to convert unicode strings again
  Add regexp to match .changes files.
  Correctly match version part of source tarballs
  dominate: convert to str
  Remove no longer used templates.
  Remove unused functions.

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

diff --git a/dak/new_security_install.py b/dak/new_security_install.py
index 353f8859dde9b5d981020cd51d911de7498e459d..866184b4e6d05e29663ed577c681b954bfe6b427 100755 (executable)
--- 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 a3b59738df18c7c7d5b9e04d3719463b0582b15a..9de1f5459dbfa4ac72f63cc1e861026f71609138 100755 (executable)
--- 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
 
 ################################################################################