Remove copychanges from dak.conf

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

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 0ba61e394800bf559c7b218fc8e028a50c3f60f8..a4dd96316d8034768b39f66d9cfedfd753063599 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -205,7 +205,6 @@ Suite
          contrib;
          non-free;
        };
-       CopyChanges "dists/proposed-updates/";
        CommentsDir "/srv/ftp-master.debian.org/queue/p-u-new/COMMENTS/";
        OverrideSuite "stable";
        ValidTime 604800; // 7 days

diff --git a/daklib/queue.py b/daklib/queue.py
index c379b0bcf8c7d92c3292d1de3bae8a48805788a9..e3874b620583f9c293de9ab7c22e136a0c954333 100755 (executable)
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -2051,10 +2051,9 @@ distribution."""
             stats.accept_bytes += float(entry["size"])
 
         # Copy the .changes file across for suite which need it.
-        copy_changes = {}
-        for suite_name in self.pkg.changes["distribution"].keys():
-            if cnf.has_key("Suite::%s::CopyChanges" % (suite_name)):
-                copy_changes[cnf["Suite::%s::CopyChanges" % (suite_name)]] = ""
+        copy_changes = dict([(x.copychanges, '')
+                             for x in session.query(Suite).filter(Suite.suite_name.in_([self.pkg.changes["distribution"].keys()])).all()
+                             if x.copychanges is not None])
 
         for dest in copy_changes.keys():
             utils.copy(self.pkg.changes_file, os.path.join(cnf["Dir::Root"], dest))