[dak/master 1/3] Reject isn't a queue
Signed-off-by: Mark Hymers <mhy@debian.org>
---
config/backports/dak.conf | 2 +-
config/debian-security/dak.conf | 2 +-
config/debian/dak.conf | 2 +-
dak/clean_queues.py | 4 ++--
daklib/queue.py | 6 +++---
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/config/backports/dak.conf b/config/backports/dak.conf
index 36e1a58..2ade7c4 100644
--- a/config/backports/dak.conf
+++ b/config/backports/dak.conf
@@ -213,12 +213,12 @@ Dir
BTSVersionTrack "/srv/backports-master.debian.org/queue/bts_version_track/";
Holding "/srv/backports-master.debian.org/queue/holding/";
Done "/srv/backports-master.debian.org/queue/done/";
+ Reject "/srv/backports-master.debian.org/queue/reject/";
Queue
{
Byhand "/srv/backports-master.debian.org/queue/byhand/";
New "/srv/backports-master.debian.org/queue/new/";
- Reject "/srv/backports-master.debian.org/queue/reject/";
Unchecked "/srv/backports-master.debian.org/queue/unchecked/";
Newstage "/srv/backports-master.debian.org/queue/newstage/";
Embargoed "/srv/backports-master.debian.org/queue/Embargoed/";
diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index 96fb97f..d0d4fb9 100644
--- a/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@ -217,12 +217,12 @@ Dir
TempPath "/srv/security-master.debian.org/tmp";
Holding "/srv/security-master.debian.org/queue/holding/";
Done "/srv/security-master.debian.org/queue/done/";
+ Reject "/srv/security-master.debian.org/queue/reject/";
Queue
{
Byhand "/srv/security-master.debian.org/queue/byhand/";
New "/srv/security-master.debian.org/queue/new/";
- Reject "/srv/security-master.debian.org/queue/reject/";
Unchecked "/srv/security-master.debian.org/queue/unchecked/";
Newstage "/srv/security-master.debian.org/queue/newstage/";
diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 24f662e..1f2bb46 100644
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -314,6 +314,7 @@ Dir
BTSVersionTrack "/srv/ftp-master.debian.org/queue/bts_version_track/";
Holding "/srv/ftp-master.debian.org/queue/holding/";
Done "/srv/ftp-master.debian.org/queue/done/";
+ Reject "/srv/ftp-master.debian.org/queue/reject/";
Queue
{
@@ -322,7 +323,6 @@ Dir
OldProposedUpdates "/srv/ftp-master.debian.org/queue/o-p-u-new/";
ProposedUpdates "/srv/ftp-master.debian.org/queue/p-u-new/";
New "/srv/ftp-master.debian.org/queue/new/";
- Reject "/srv/ftp-master.debian.org/queue/reject/";
Unchecked "/srv/ftp-master.debian.org/queue/unchecked/";
Newstage "/srv/ftp-master.debian.org/queue/newstage/";
Embargoed "/srv/ftp-master.debian.org/does/not/exist/";
diff --git a/dak/clean_queues.py b/dak/clean_queues.py
index 474fe39..31cf86f 100755
--- a/dak/clean_queues.py
+++ b/dak/clean_queues.py
@@ -201,10 +201,10 @@ def main ():
print "Processing incoming..."
flush_orphans()
- reject = cnf["Dir::Queue::Reject"]
+ reject = cnf["Dir::Reject"]
if os.path.exists(reject) and os.path.isdir(reject):
if Options["Verbose"]:
- print "Processing incoming/REJECT..."
+ print "Processing reject directory..."
os.chdir(reject)
flush_old()
diff --git a/daklib/queue.py b/daklib/queue.py
index a8ea303..d5858c1 100755
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -2314,7 +2314,7 @@ distribution."""
if os.access(file_entry, os.R_OK) == 0:
continue
- dest_file = os.path.join(cnf["Dir::Queue::Reject"], file_entry)
+ dest_file = os.path.join(cnf["Dir::Reject"], file_entry)
try:
dest_fd = os.open(dest_file, os.O_RDWR | os.O_CREAT | os.O_EXCL, 0644)
@@ -2326,7 +2326,7 @@ distribution."""
except NoFreeFilenameError:
# Something's either gone badly Pete Tong, or
# someone is trying to exploit us.
- utils.warn("**WARNING** failed to find a free filename for %s in %s." % (file_entry, cnf["Dir::Queue::Reject"]))
+ utils.warn("**WARNING** failed to find a free filename for %s in %s." % (file_entry, cnf["Dir::Reject"]))
return
# Make sure we really got it
@@ -2396,7 +2396,7 @@ distribution."""
cnf = Config()
reason_filename = self.pkg.changes_file[:-8] + ".reason"
- reason_filename = os.path.join(cnf["Dir::Queue::Reject"], reason_filename)
+ reason_filename = os.path.join(cnf["Dir::Reject"], reason_filename)
# Move all the files into the reject directory
reject_files = self.pkg.files.keys() + [self.pkg.changes_file]
--
1.7.2.5
Reply to: