Merge branch 'master' of ftpmaster's dak repository

Conflicts:

	ChangeLog

diff --git a/ChangeLog b/ChangeLog
index cc6c1c8e8d721924b629c4537b398e2d56d2b56a..5448fb95f9610204153da8dc93dc34c2debdfe2d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -31,6 +31,20 @@
        in a manifest and insert the values found into the files dict,
        checking the file sizes on the way
 
+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
+       buildd.emdebian.org
+
+       * dak/process_new.py (_accept): Fix Philipps new helper function
+       to not break by moving Upload.build_summaries there.
+
 2008-08-31  Philipp Kern  <pkern@debian.org>
 
        * dak/process_new.py (_accept): new helper function to accept

diff --git a/config/debian/pseudo-packages.description b/config/debian/pseudo-packages.description
index ab08f8f45f6b921fa773c47c3b972b0dca5e4bc6..d6993adc9f7866a208ad6960075b3998c48e7ddd 100644 (file)
--- a/config/debian/pseudo-packages.description
+++ b/config/debian/pseudo-packages.description
@@ -22,3 +22,5 @@ release-notes         Problems with the Release Notes
 wiki.debian.org                Problems with the Debian wiki
 security-tracker       The Debian Security Bug Tracker
 release.debian.org     Requests regarding Debian releases and release team tools
+debian-i18n                    Requests regarding Internationalization (i18n) of the distribution
+buildd.emdebian.org            Problems related to building packages for Emdebian

diff --git a/config/debian/pseudo-packages.maintainers b/config/debian/pseudo-packages.maintainers
index b7ab02357dc1f22a8517eaf141798726e74b597a..0d8c60095baeb9e86085ff8ecf1b233ebe3bd0c9 100644 (file)
--- a/config/debian/pseudo-packages.maintainers
+++ b/config/debian/pseudo-packages.maintainers
@@ -22,3 +22,5 @@ release-notes           Debian Documentation Team <debian-doc@lists.debian.org>
 wiki.debian.org         Debian WWW Team <debian-www@lists.debian.org>
 security-tracker        Debian Security Tracker Team <debian-security-tracker@lists.debian.org>
 release.debian.org      Debian Release Team <debian-release@lists.debian.org>
+debian-i18n             Debian I18N Team <debian-i18n@lists.debian.org>
+buildd.emdebian.org                    Debian Embedded Team <debian-embedded@lists.debian.org>

diff --git a/dak/process_new.py b/dak/process_new.py
index f79c87ee8f4e91ef42387597af6b15e036a3b4c1..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"]:
@@ -844,11 +844,11 @@ def move_to_holding(suite, queue_dir):
 def _accept():
     if Options["No-Action"]:
         return
+    (summary, short_summary) = Upload.build_summaries()
     Upload.accept(summary, short_summary)
     os.unlink(Upload.pkg.changes_file[:-8]+".dak")
 
 def do_accept_stableupdate(suite, q):
-    (summary, short_summary) = Upload.build_summaries()
     queue_dir = Cnf["Dir::Queue::%s" % (q,)]
     if not Upload.pkg.changes["architecture"].has_key("source"):
         # It is not a sourceful upload.  So its source may be either in p-u