Merge remote branch 'drkranz/rm822' into merge

* drkranz/rm822:
  Some code cleanups
  cron.hourly: generate removals-full.822
  rm.py: implement rfc822 removal format
  rm822.py script to convert removals log into rfc822 format

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

diff --git a/config/debian/apache.conf-incoming b/config/debian/apache.conf-incoming
index a9f775ca55c842e607b5edd63acf69c565fd36bf..0edf6dcef7fb32c29da6f4d21b125065d5aa1dd4 100644 (file)
--- a/config/debian/apache.conf-incoming
+++ b/config/debian/apache.conf-incoming
@@ -35,15 +35,17 @@
     allow from 213.188.99.214
     allow from 213.188.99.208
   # amd64
-    # fivetimesnine.de - fs
-    allow from 194.0.163.247
-    # excelsior
-    allow from 77.243.184.66
-    # thukydides, HE
-    allow from 78.47.240.182
     # barber
     allow from 194.177.211.203
     allow from 2001:648:2ffc:deb:214:22ff:feb2:2370
+    # brahms
+    Allow from 206.12.19.115
+    # vitry (archive rebuild)
+    allow from 194.177.211.206
+    allow from 2001:648:2ffc:deb:214:22ff:feb2:122c
+    # krenek (archive rebuild)
+    allow from 194.177.211.207
+    allow from 2001:648:2ffc:deb:214:22ff:feb1:ff56
   # arm
     # netwinder
     allow from 192.133.104.24
@@ -68,6 +70,14 @@
     allow from 157.193.39.233
     # ancina
     allow from 157.193.39.13
+    # arnold
+    allow from 217.140.96.57
+    # alain
+    allow from 217.140.96.58
+    # alwyn
+    allow from 217.140.96.59
+    # antheil
+    allow from 217.140.96.60
   # hppa
     # sarti
     allow from 193.201.200.199
@@ -87,14 +97,8 @@
     # back / mozart (xen domains; NOT .debian.org)
     allow from 80.87.129.151
   # i386
-    # puccini
-    Allow from 87.106.4.56
-    # brahms
-    Allow from 206.12.19.115
     # murphy
     Allow from 70.103.162.31
-    # demosthenes, HE
-    allow from 78.47.223.98
     # biber
     allow from 194.177.211.204
     allow from 2001:648:2ffc:deb:214:22ff:feb2:1268
@@ -103,8 +107,6 @@
     allow from 193.201.200.200
     # mundi
     allow from 192.25.206.62
-    # zx6000.gag.com
-    allow from 192.133.104.50
     # alkman
     allow from 192.25.206.63
   # mips
@@ -136,9 +138,6 @@
     allow from 72.66.115.54
     # praetorius
     allow from 130.239.18.121
-    # purcell
-    allow from 82.195.75.69
-    allow from 2001:41b8:202:deb:20a:95ff:fe6c:3c02
     # poulenc
     allow from 144.32.168.77
     # porpora

diff --git a/daklib/queue.py b/daklib/queue.py
index 165b7088e2c01a4c762d856c1e0e846427f1147b..0fe175f80de54f0eabcc61b0d7231aaac36618af 100755 (executable)
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -775,7 +775,7 @@ class Upload(object):
         location = cnf["Dir::Pool"]
         l = get_location(location, entry["component"], session=session)
         if l is None:
-            self.rejects.append("[INTERNAL ERROR] couldn't determine location (Component: %)" % entry["component"])
+            self.rejects.append("[INTERNAL ERROR] couldn't determine location (Component: %s)" % entry["component"])
             entry["location id"] = -1
         else:
             entry["location id"] = l.location_id