From: Mark Hymers <mhy@debian.org>
Date: Wed, 27 Jul 2011 16:58:26 +0000 (+0100)
Subject: Clean up boolean logic
X-Git-Url: https://git.decadent.org.uk/gitweb/?p=dak.git;a=commitdiff_plain;h=e39ac4bb9c19e58585b64fba058fb6218a24d9e3

Clean up boolean logic

Signed-off-by: Mark Hymers <mhy@debian.org>
---

diff --git a/config/backports/dak.conf b/config/backports/dak.conf
index a9f4886c..1c8312d6 100644
--- a/config/backports/dak.conf
+++ b/config/backports/dak.conf
@@ -36,7 +36,6 @@ Dinstall
    DefaultSuite "lenny-backports";
    Reject
    {
-     NoSourceOnly "true";
      ReleaseTransitions "/srv/backports-master.debian.org/hints/transitions.yaml";
    };
    // If set, only send mails to addresses listed there.
diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index fb23848e..6c4c5c6b 100644
--- a/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@ -34,6 +34,7 @@ Dinstall
    SuiteSuffix "updates/";
    OverrideMaintainer "dak@security.debian.org";
    LegacyStableHasNoSections "false";
+   AllowSourceOnlyUploads "true";
 };
 
 Process-New
diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 293df65d..858c1f71 100644
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -27,7 +27,6 @@ Dinstall
    LintianTags "/srv/ftp-master.debian.org/dak/config/debian/lintian.tags";
    Reject
    {
-     NoSourceOnly "true";
      ReleaseTransitions "/srv/ftp.debian.org/web/transitions.yaml";
    };
    // if you setup an own dak repository and want to upload Debian packages you most possibly want
diff --git a/daklib/queue.py b/daklib/queue.py
index c9ebb482..c5cd4a68 100755
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -1108,7 +1108,7 @@ class Upload(object):
             if not has_source:
                 self.rejects.append("no source found and Architecture line in changes mention source.")
 
-            if not has_binaries and cnf.FindB("Dinstall::Reject::NoSourceOnly"):
+            if (not has_binaries) and (not cnf.FindB("Dinstall::AllowSourceOnlyUploads")):
                 self.rejects.append("source only uploads are not supported.")
 
     ###########################################################################