From: Joerg Jaspert <joerg@debian.org>
Date: Sun, 19 Sep 2010 14:32:21 +0000 (+0200)
Subject: Remove copychanges from dak.conf
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc6ef10f9e5994c51e68622d964a2f798ae801b9;p=dak

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 0ba61e39..a4dd9631 100644
--- 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 c379b0bc..e3874b62 100755
--- 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))