defaultsuite stuff

check upload_suite and not only default_suite.

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

diff --git a/ChangeLog b/ChangeLog
index 468f6047be368084e608cba47a42f90af32cd53b..31085d640649ee71878fa746e66f7a157e4bbcd9 100644 (file)
--- 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 bc978ee20a413e4f638955203f4c91bb48ce760b..6e2ebc708f604381ea53db4952ae1dfeec10f978 100644 (file)
--- 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 5884db181ab6bf302a6a177e5ee8f6a1d06e29ab..e2301035ccff9050c3b8677ff911b2f34f772b78 100755 (executable)
--- 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