From: Joerg Jaspert <joerg@debian.org>
Date: Sat, 1 Nov 2008 19:47:37 +0000 (+0100)
Subject: Merge branch 'master' into security
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=30b1d57ed3df70b938f29044742ecae59c570d99;hp=f8996e240d9d0278bce098e23be63db0bcc6fbee;p=dak.git

Merge branch 'master' into security

* master:
  defaultsuite stuff
---

diff --git a/ChangeLog b/ChangeLog
index 8c7ce8a4..730146e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-11-01  Joerg Jaspert  <joerg@debian.org>
+
+	* dak/process_unchecked.py (check_files): Also check the
+	upload_suite for uploads. I guess we could kill the default_suite
+	totally, but for now we just look into the upload_suite one too.
+
+	* config/debian-security/dak.conf: Let DefaultSuite be stable
+
 2008-10-27  Joerg Jaspert  <joerg@debian.org>
 
 	* scripts/debian/mkfilesindices: Remove oldstable
diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index bc978ee2..6e2ebc70 100644
--- a/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@ -31,7 +31,7 @@ Dinstall
    };
    SecurityQueueHandling "true";     
    SecurityQueueBuild "true";     
-   DefaultSuite "oldstable";
+   DefaultSuite "stable";
    SuiteSuffix "updates";
    OverrideMaintainer "dak@security.debian.org";
    StableDislocationSupport "false";
diff --git a/dak/process_unchecked.py b/dak/process_unchecked.py
index 5884db18..e2301035 100755
--- a/dak/process_unchecked.py
+++ b/dak/process_unchecked.py
@@ -450,7 +450,8 @@ def check_files():
             # Ensure the architecture of the .deb is one we know about.
             default_suite = Cnf.get("Dinstall::DefaultSuite", "Unstable")
             architecture = control.Find("Architecture")
-            if architecture not in Cnf.ValueList("Suite::%s::Architectures" % (default_suite)):
+            upload_suite = changes["distribution"]
+            if architecture not in Cnf.ValueList("Suite::%s::Architectures" % (default_suite)) and architecture not in Cnf.ValueList("Suite::%s::Architectures" % (upload_suite)):
                 reject("Unknown architecture '%s'." % (architecture))
 
             # Ensure the architecture of the .deb is one of the ones