[dak/master] defaultsuite stuff

[Joerg Jaspert <joerg@debian.org>]

check upload_suite and not only default_suite.

Signed-off-by: Joerg Jaspert <joerg@debian.org>
---
 ChangeLog                       |    8 ++++++++
 config/debian-security/dak.conf |    2 +-
 dak/process_unchecked.py        |    3 ++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 468f604..31085d6 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 bc978ee..6e2ebc7 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 5884db1..e230103 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
-- 
1.5.6.5