Merge branch 'master' of ftp-master.debian.org:/srv/ftp.debian.org/git/dak

diff --git a/dak/split_done.py b/dak/split_done.py
index 563a89812b8938463fc9c68a85dcee54a04c863e..87b38827706ac752a17afc91f7a629070f9c3a08 100755 (executable)
--- a/dak/split_done.py
+++ b/dak/split_done.py
@@ -43,7 +43,8 @@ def main():
                 os.makedirs(dirname)
             dest = dirname + '/' + os.path.basename(filename)
             if os.path.exists(dest):
-                utils.fubar("%s already exists." % (dest))
+                utils.warn("%s already exists." % (dest))
+                continue
             print "Move: %s -> %s" % (filename, dest)
             os.rename(filename, dest)
             count = count + 1

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"])