Remove copychanges from dak.conf

[dak.git] / daklib / queue.py

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))