Use announce value out of the database

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

diff --git a/config/backports/dak.conf b/config/backports/dak.conf
index eaa89c2737608bd688ce6eb60115b69f12363a5f..78abe4b93ab06a93a4727a3fc582e415e845668b 100644 (file)
--- a/config/backports/dak.conf
+++ b/config/backports/dak.conf
@@ -189,7 +189,6 @@ Suite
          non-free;
        };
 
-       Announce "debian-backports-changes@lists.debian.org";
        Origin "Debian Backports";
        Description "Backports for the Lenny Distribution";
        CodeName "lenny-backports";
@@ -208,7 +207,6 @@ Suite
          non-free;
        };
 
-       Announce "debian-backports-changes@lists.debian.org";
        Origin "Debian Backports";
        Description "Backports for the Squeeze Distribution";
        CodeName "squeeze-backports";

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 6db8add5e7e0bfb9fd23f3c49a88c8b66d328686..719fae261dc48c5c78b7e1bd836671d597de94c1 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -195,7 +195,6 @@ Suite
          contrib;
          non-free;
        };
-       Announce "debian-changes@lists.debian.org";
        // Version "5.0r0";
        Origin "Debian";
        // Description "Debian 5.0r0 Released 14 February 2009";
@@ -213,7 +212,6 @@ Suite
          contrib;
          non-free;
        };
-       Announce "debian-changes@lists.debian.org";
        CopyChanges "dists/proposed-updates/";
        CopyDotDak "/srv/ftp-master.debian.org/queue/proposed-updates/";
        CommentsDir "/srv/ftp-master.debian.org/queue/p-u-new/COMMENTS/";
@@ -253,7 +251,6 @@ Suite
          contrib;
          non-free;
        };
-       Announce "debian-testing-changes@lists.debian.org";
        Origin "Debian";
        Description "Debian Testing distribution - Not Released";
        CodeName "squeeze";
@@ -270,7 +267,6 @@ Suite
          contrib;
          non-free;
        };
-       Announce "debian-testing-changes@lists.debian.org";
        Origin "Debian";
        Description "Debian Testing distribution updates - Not Released";
        CodeName "squeeze-proposed-updates";
@@ -307,7 +303,6 @@ Suite
          contrib;
          non-free;
        };
-       Announce "debian-testing-changes@lists.debian.org";
        Origin "Debian";
        Description "Volatile Packages for Debian x.y (testing)";
        CodeName "squeeze-volatile";
@@ -339,7 +334,6 @@ Suite
          contrib;
          non-free;
        };
-       Announce "debian-devel-changes@lists.debian.org";
        Origin "Debian";
        Description "Debian Unstable - Not Released";
        CodeName "sid";
@@ -367,7 +361,6 @@ Suite
          contrib;
          non-free;
        };
-       Announce "debian-devel-changes@lists.debian.org";
        Origin "Debian";
        Description "Experimental packages - not released; use at your own risk.";
        CodeName "experimental";

diff --git a/daklib/queue.py b/daklib/queue.py
index 7d7faa4bb510150157215cee7959a04e77396daf..c379b0bcf8c7d92c3292d1de3bae8a48805788a9 100755 (executable)
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -1913,7 +1913,8 @@ distribution."""
         self.Subst["__SHORT_SUMMARY__"] = short_summary
 
         for dist in self.pkg.changes["distribution"].keys():
-            announce_list = cnf.Find("Suite::%s::Announce" % (dist))
+            suite = get_suite(dist)
+            announce_list = suite.announce
             if announce_list == "" or lists_done.has_key(announce_list):
                 continue