[dak/master 08/18] Done isn't a queue either
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/split_done.py | 4 ++--
daklib/queue.py | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/config/backports/dak.conf b/config/backports/dak.conf
index 0bfa284..36e1a58 100644
--- 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 ec3501e..11823b8 100644
--- 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 d74d564..721950b 100644
--- 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 87b3882..3d07287 100755
--- 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 48d0fa3..c7785ad 100755
--- 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)
--
1.7.2.5
Reply to: