From aa43d9d1dd9d440c22c86c93d195c1b2b15ce216 Mon Sep 17 00:00:00 2001 From: Joerg Jaspert Date: Sat, 1 Nov 2008 20:47:07 +0100 Subject: [PATCH] defaultsuite stuff check upload_suite and not only default_suite. Signed-off-by: Joerg Jaspert --- 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 468f6047..31085d64 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-11-01 Joerg Jaspert + + * 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 * 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 -- 2.39.5