[dak/master 4/5] Clean up boolean logic
Signed-off-by: Mark Hymers <mhy@debian.org>
---
config/backports/dak.conf | 1 -
config/debian-security/dak.conf | 1 +
config/debian/dak.conf | 1 -
daklib/queue.py | 2 +-
4 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/config/backports/dak.conf b/config/backports/dak.conf
index a9f4886..1c8312d 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 fb23848..6c4c5c6 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 293df65..858c1f7 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 c9ebb48..c5cd4a6 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.")
###########################################################################
--
1.7.2.5
Reply to: