X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fprocess_unchecked.py;h=9b1b48671177773ddab7bb8606fba61fc9804883;hb=f25d894cf1d8db4d64a04d990531700616a45074;hp=1cf2234ecd2f10a4a0f6b132980e25e40f175f67;hpb=1955704e1679c2061856a241f205efca4796f799;p=dak.git

diff --git a/dak/process_unchecked.py b/dak/process_unchecked.py
index 1cf2234e..9b1b4867 100755
--- a/dak/process_unchecked.py
+++ b/dak/process_unchecked.py
@@ -529,8 +529,15 @@ def check_files():
                         files[file]["byhand"] = 1
                     elif os.path.exists(Cnf["Dir::Queue::New"] + '/' + dsc_filename):
                         files[file]["new"] = 1
-                    elif not os.path.exists(Cnf["Dir::Queue::Accepted"] + '/' + dsc_filename):
-                        reject("no source found for %s %s (%s)." % (source_package, source_version, file))
+                    else:
+		        dsc_file_exists = 0
+                        for myq in ["Accepted", "Embargoed", "Unembargoed", "ProposedUpdates"]:
+			    if Cnf.has_key("Dir::Queue::%s" % (myq)):
+				if os.path.exists(Cnf["Dir::Queue::"+myq] + '/' + dsc_filename):
+				    dsc_file_exists = 1
+				    break
+			if not dsc_file_exists:
+                            reject("no source found for %s %s (%s)." % (source_package, source_version, file))
             # Check the version and for file overwrites
             reject(Upload.check_binary_against_db(file),"")
 
@@ -1134,7 +1141,12 @@ def is_unembargo ():
     if ql:
         return 1
 
-    if pkg.directory == Cnf["Dir::Queue::Disembargo"].rstrip("/"):
+    oldcwd = os.getcwd()
+    os.chdir(Cnf["Dir::Queue::Disembargo"])
+    disdir = os.getcwd()
+    os.chdir(oldcwd)
+
+    if pkg.directory == disdir:
         if changes["architecture"].has_key("source"):
             if Options["No-Action"]: return 1