From: Philipp Kern Date: Sun, 7 Sep 2008 14:33:11 +0000 (+0000) Subject: Merge branch 'master' of ftpmaster's dak repository X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=e79e9a1395528354b5978fc4b92a8fcdd1559d70;hp=95f05e8aac2673dadfef6aed999551d60cb6d322;p=dak.git Merge branch 'master' of ftpmaster's dak repository Conflicts: ChangeLog --- diff --git a/ChangeLog b/ChangeLog index cc6c1c8e..5448fb95 100644 --- 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 + + * 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 + + * 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 * 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 ab08f8f4..d6993adc 100644 --- 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 b7ab0235..0d8c6009 100644 --- a/config/debian/pseudo-packages.maintainers +++ b/config/debian/pseudo-packages.maintainers @@ -22,3 +22,5 @@ release-notes Debian Documentation Team wiki.debian.org Debian WWW Team security-tracker Debian Security Tracker Team release.debian.org Debian Release Team +debian-i18n Debian I18N Team +buildd.emdebian.org Debian Embedded Team diff --git a/dak/process_new.py b/dak/process_new.py index f79c87ee..3dd93ada 100755 --- 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