Done isn't a queue either

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

diff --git a/config/backports/dak.conf b/config/backports/dak.conf
index 0bfa284f79827acdf6f58916ece12876660d9fa7..36e1a58ecdc05c7081d05ca24fcaf70f1598bd81 100644 (file)
--- a/config/backports/dak.conf
+++ b/config/backports/dak.conf
@@ -212,11 +212,11 @@ Dir
   TempPath "/srv/backports-master.debian.org/tmp";
   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/";
 
   Queue
   {
     Byhand "/srv/backports-master.debian.org/queue/byhand/";
-    Done "/srv/backports-master.debian.org/queue/done/";
     New "/srv/backports-master.debian.org/queue/new/";
     Reject "/srv/backports-master.debian.org/queue/reject/";
     Unchecked "/srv/backports-master.debian.org/queue/unchecked/";

diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index ec3501ede7943656eb23445f5d94e339148a231a..11823b8e83ed595f7a886758e384e598eeeff74f 100644 (file)
--- a/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@ -224,11 +224,11 @@ Dir
   Upload "/srv/queued/ftpmaster/";
   TempPath "/srv/security-master.debian.org/tmp";
   Holding "/srv/security-master.debian.org/queue/holding/";
+  Done "/srv/security-master.debian.org/queue/done/";
 
   Queue
   {
     Byhand "/srv/security-master.debian.org/queue/byhand/";
-    Done "/srv/security-master.debian.org/queue/done/";
     New "/srv/security-master.debian.org/queue/new/";
     Reject "/srv/security-master.debian.org/queue/reject/";
     Unchecked "/srv/security-master.debian.org/queue/unchecked/";

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index d74d564104fe7cbdb9b93d942f63f9b4ab5661f8..721950b9fa765c930fe54c53647b8eecae78621c 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -326,6 +326,7 @@ Dir
   TempPath "/srv/ftp-master.debian.org/tmp/";
   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/";
 
   Queue
   {
@@ -333,7 +334,6 @@ Dir
     ProposedUpdates "/srv/ftp-master.debian.org/queue/p-u-new/";
     OldProposedUpdates "/srv/ftp-master.debian.org/queue/o-p-u-new/";
     ProposedUpdates "/srv/ftp-master.debian.org/queue/p-u-new/";
-    Done "/srv/ftp-master.debian.org/queue/done/";
     New "/srv/ftp-master.debian.org/queue/new/";
     Reject "/srv/ftp-master.debian.org/queue/reject/";
     Unchecked "/srv/ftp-master.debian.org/queue/unchecked/";

diff --git a/dak/split_done.py b/dak/split_done.py
index 87b38827706ac752a17afc91f7a629070f9c3a08..3d07287240f18fb4e5272274dffc53fa8fe7d760 100755 (executable)
--- a/dak/split_done.py
+++ b/dak/split_done.py
@@ -29,8 +29,8 @@ def main():
     Cnf = utils.get_conf()
     count = 0
     move_date = int(time.time())
-    os.chdir(Cnf["Dir::Queue::Done"])
-    files = glob.glob("%s/*" % (Cnf["Dir::Queue::Done"]))
+    os.chdir(Cnf["Dir::Done"])
+    files = glob.glob("%s/*" % (Cnf["Dir::Done"]))
     for filename in files:
         if os.path.isfile(filename):
             filemtime = os.stat(filename)[stat.ST_MTIME]

diff --git a/daklib/queue.py b/daklib/queue.py
index 48d0fa3389b4a9c789a0920e495c8a344e6a3fab..c7785adeb0ac81ec1bf133c5e322e3e1d2ada758 100755 (executable)
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -2174,7 +2174,7 @@ distribution."""
 
         # Move the .changes into the 'done' directory
         ye, mo, da = time.gmtime()[0:3]
-        donedir = os.path.join(cnf["Dir::Queue::Done"], str(ye), "%0.2d" % mo, "%0.2d" % da)
+        donedir = os.path.join(cnf["Dir::Done"], str(ye), "%0.2d" % mo, "%0.2d" % da)
         if not os.path.isdir(donedir):
             os.makedirs(donedir)