From: Torsten Werner <twerner@debian.org>
Date: Thu, 24 Mar 2011 21:22:22 +0000 (+0100)
Subject: Merge branch 'master' of ftp-master.debian.org:/srv/ftp.debian.org/git/dak
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=aadee5e8b1506ac0a14bfe2d0d0e0bcbf25a7376;hp=71c48c6fce3e9f48367a19ed87c2400142c6f722;p=dak.git

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 563a8981..87b38827 100755
--- 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 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"])