From: Mark Hymers <mhy@debian.org>
Date: Thu, 24 Mar 2011 21:12:54 +0000 (+0000)
Subject: Put changes files straight into the hashed queue/done dir
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=0ce7303ebc8d854fa8061669d39aba933665af6c;p=dak.git

Put changes files straight into the hashed queue/done dir

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

diff --git a/daklib/queue.py b/daklib/queue.py
index b7eba953..20a8ddf4 100755
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -2188,8 +2188,13 @@ distribution."""
         session.commit()
 
         # Move the .changes into the 'done' directory
+        ye, mo, da = time.gmtime()[0:3]
+        donedir = os.path.join(cnf["Dir::Queue::Done"], str(ye), str(mo), str(da))
+        if not os.path.isdir(donedir):
+            os.makedirs(donedir)
+
         utils.move(self.pkg.changes_file,
-                   os.path.join(cnf["Dir::Queue::Done"], os.path.basename(self.pkg.changes_file)))
+                   os.path.join(donedir, os.path.basename(self.pkg.changes_file)))
 
         if self.pkg.changes["architecture"].has_key("source") and cnf.get("Dir::UrgencyLog"):
             UrgencyLog().log(self.pkg.dsc["source"], self.pkg.dsc["version"], self.pkg.changes["urgency"])