]> err.no Git - dak/commitdiff
dak/process_policy.py: don't try to copy files to accepted twice
authorAnsgar Burchardt <ansgar@debian.org>
Sat, 17 Nov 2012 15:39:53 +0000 (16:39 +0100)
committerAnsgar Burchardt <ansgar@debian.org>
Sat, 17 Nov 2012 15:39:53 +0000 (16:39 +0100)
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.

dak/process_policy.py

index db459607588971ae19c1b80b6dc04dd85b44560a..ab58cfe1dce84ce2cc990c01b7987c7636220f66 100755 (executable)
@@ -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