From: Joerg Jaspert <joerg@debian.org>
Date: Sat, 30 Aug 2008 18:56:00 +0000 (+0200)
Subject: Merge commit 'pkern/master'
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=fedba6890acf4f77e4b6a63f8992cff21adeb7f1;hp=86de24686031e6971970bf609e1a48f2e77f1142;p=dak.git

Merge commit 'pkern/master'

* commit 'pkern/master':
  dak/process_new.py (is_source_in_queue_dir): add the queue path to the changes filename
---

diff --git a/ChangeLog b/ChangeLog
index 69641910..e1c09fcb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-30  Philipp Kern  <pkern@debian.org>
+
+	* dak/process_new.py (is_source_in_queue_dir): join the queue path
+	because os.listdir entries come with their path stripped
+
 2008-08-30  Philipp Kern  <pkern@debian.org>
 
 	* dak/process_new.py (do_accept_stableupdate): state what we intend
diff --git a/dak/process_new.py b/dak/process_new.py
index bd0653e0..0e1d5c03 100755
--- a/dak/process_new.py
+++ b/dak/process_new.py
@@ -819,7 +819,7 @@ def is_source_in_queue_dir(qdir):
     for entry in entries:
         # read the .dak
         u = queue.Upload(Cnf)
-        u.pkg.changes_file = entry
+        u.pkg.changes_file = os.path.join(qdir, entry)
         u.update_vars()
         if not Upload.pkg.changes["architecture"].has_key("source"):
             # another binary upload, ignore