X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fqueue.py;h=c2f0414f6e31adb42402376a928e30787bf1405a;hb=62bb13893107fc5c499d6e94ec7549fcf996c9df;hp=49b465d5a42c1bff1f848324d62ac432eb1dc33a;hpb=d466d5474f1b7a4abee0954bc27b67296fd7c76e;p=dak.git

diff --git a/daklib/queue.py b/daklib/queue.py
index 49b465d5..c2f0414f 100755
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -1058,7 +1058,7 @@ class Upload(object):
             # TODO: Dynamically generate this list
             for queue_name in [ "byhand", "new", "proposedupdates", "oldproposedupdates", "embargoed", "unembargoed" ]:
                 queue = get_policy_queue(queue_name, session)
-                if queue and os.path.exists(queue.path, f):
+                if queue and os.path.exists(os.path.join(queue.path, f)):
                     self.rejects.append("%s file already exists in the %s queue." % (f, queue_name))
 
             if not re_taint_free.match(f):
@@ -1318,8 +1318,8 @@ class Upload(object):
         # Extract the source
         try:
             unpacked = UnpackedSource(dsc_filename)
-        except:
-            self.rejects.append("'dpkg-source -x' failed for %s." % dsc_filename)
+        except Exception, e:
+            self.rejects.append("'dpkg-source -x' failed for %s. (%s)" % (dsc_filename, str(e)))
             return
 
         if not cnf.Find("Dir::BTSVersionTrack"):