From: Ansgar Burchardt <ansgar@debian.org>
Date: Sat, 17 Nov 2012 15:39:53 +0000 (+0100)
Subject: dak/process_policy.py: don't try to copy files to accepted twice
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=354d46ad379c4c4e167d0fa7cdf7f9c34f3afbcd;p=dak

dak/process_policy.py: don't try to copy files to accepted twice

We might already have copied files to accepted before, for example when
accepting multiple uploads that use the same upstream tarball. So we
have to ignore existing files here.
---

diff --git a/dak/process_policy.py b/dak/process_policy.py
index db459607..ab58cfe1 100755
--- a/dak/process_policy.py
+++ b/dak/process_policy.py
@@ -162,16 +162,19 @@ def comment_accept(upload, srcqueue, comments, transaction):
         if upload.source is not None:
             for f in [ df.poolfile for df in upload.source.srcfiles ]:
                 dst = os.path.join(copydir, f.basename)
-                fs.copy(f.fullpath, dst, mode=mode)
+                if not os.path.exists(dst):
+                    fs.copy(f.fullpath, dst, mode=mode)
 
         for db_binary in upload.binaries:
             f = db_binary.poolfile
             dst = os.path.join(copydir, f.basename)
-            fs.copy(f.fullpath, dst, mode=mode)
+            if not os.path.exists(dst):
+                fs.copy(f.fullpath, dst, mode=mode)
 
         src = os.path.join(upload.policy_queue.path, upload.changes.changesname)
         dst = os.path.join(copydir, upload.changes.changesname)
-        fs.copy(src, dst, mode=mode)
+        if not os.path.exists(dst):
+            fs.copy(src, dst, mode=mode)
 
     if upload.source is not None and not Options['No-Action']:
         urgency = upload.changes.urgency