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 b7eba9537aba8fbabb8883cb0e9c4a9726af47b2..20a8ddf45f4b3ed2193f094767473e09a09fc456 100755 (executable)
--- 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"])