Merge commit 'pkern/p-u-new' into merge

* commit 'pkern/p-u-new':
  dak/process_new.py (is_source_in_queue_dir): access u instead of Upload

Signed-off-by: Joerg Jaspert <joerg@debian.org>

diff --git a/ChangeLog b/ChangeLog
index ef17b0d4e06026caf7ba195677e252da7a4f6268..0f82968c6ec14f00594006b10080e585c76cd4d4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-06  Philipp Kern  <pkern@debian.org>
+
+       * dak/process_new.py (is_source_in_queue_dir): Access the right
+       variable to check if the given entry in the queue is the sourceful
+       upload we are looking for.
+
 2008-09-02  Joerg Jaspert  <joerg@debian.org>
 
        * config/debian/pseudo-packages.description: Added debian-i18n and

diff --git a/dak/process_new.py b/dak/process_new.py
index 6ac1d44dac7ee6242a9ea3219a0e69ad4c96377f..3dd93ada1a68ba480c2dcf6c6a9d186e09ef7da4 100755 (executable)
--- a/dak/process_new.py
+++ b/dak/process_new.py
@@ -822,7 +822,7 @@ def is_source_in_queue_dir(qdir):
         u = queue.Upload(Cnf)
         u.pkg.changes_file = os.path.join(qdir, entry)
         u.update_vars()
-        if not Upload.pkg.changes["architecture"].has_key("source"):
+        if not u.pkg.changes["architecture"].has_key("source"):
             # another binary upload, ignore
             continue
         if Upload.pkg.changes["version"] != u.pkg.changes["version"]: