From: Anthony Towns <aj@azure.humbug.org.au>
Date: Mon, 14 Jan 2008 06:12:51 +0000 (+0000)
Subject: process_unchecked: Check for duplicate files in embargoed/unembargoed
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=d01b87da9158bfdc35fdb0628556fd3c9bb49eae;p=dak.git

process_unchecked: Check for duplicate files in embargoed/unembargoed
dirs, if configured
---

diff --git a/dak/process_unchecked.py b/dak/process_unchecked.py
index a18b1b19..d6a25b0e 100755
--- a/dak/process_unchecked.py
+++ b/dak/process_unchecked.py
@@ -387,7 +387,8 @@ def check_files():
 
     for file in file_keys:
         # Ensure the file does not already exist in one of the accepted directories
-        for dir in [ "Accepted", "Byhand", "New", "ProposedUpdates", "OldProposedUpdates" ]:
+        for dir in [ "Accepted", "Byhand", "New", "ProposedUpdates", "OldProposedUpdates", "Embargoed", "Unembargoed" ]:
+	    if not Cnf.has_key("Dir::Queue::%s" % (dir)): continue
             if os.path.exists(Cnf["Dir::Queue::%s" % (dir) ]+'/'+file):
                 reject("%s file already exists in the %s directory." % (file, dir))
         if not daklib.utils.re_taint_free.match(file):