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 a9f4886c9627275b4844bbb76ceb16d5ebd5d415..1c8312d60b2a4d6fd3192592b7c85c58185419da 100644 (file)
--- 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 fb23848eed79e396c039234f06554070a12ae081..6c4c5c6b852bb4b1d05d949ecc3d04c6b4cf6bbb 100644 (file)
--- 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 293df65dc1eaac04fbde44f2196e2fc78742527a..858c1f7149ca7ace260f2eb04930f59ee6f04074 100644 (file)
--- 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 c9ebb4825d1bbdb7af44405da968e3ffe0068226..c5cd4a68b8595992bfeeafd2ebdd2fc30bdf12cb 100755 (executable)
--- 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.")
 
     ###########################################################################