From: Torsten Werner <twerner@debian.org>
Date: Mon, 7 Feb 2011 22:15:21 +0000 (+0100)
Subject: Merge branch 'master' of ssh://ftp-master.debian.org/srv/ftp.debian.org/git/dak
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=2f30eb272c2dfbdb3544d7e0a0e120a9e4be3294;hp=fe57da654e2d1258f3cffec9344c217ed30d16ed;p=dak.git

Merge branch 'master' of ssh://ftp-master.debian.org/srv/ftp.debian.org/git/dak
---

diff --git a/daklib/dbconn.py b/daklib/dbconn.py
index dc5518a9..67852949 100755
--- a/daklib/dbconn.py
+++ b/daklib/dbconn.py
@@ -2902,8 +2902,8 @@ class DBConn(object):
             # The following tables have primary keys but sqlalchemy
             # version 0.5 fails to reflect them correctly with database
             # versions before upgrade #41.
-            #'changes',
-            #'build_queue_files',
+            'changes',
+            'build_queue_files',
         )
 
         tables_no_primary = (
@@ -2917,8 +2917,8 @@ class DBConn(object):
             'suite_build_queue_copy',
             'udeb_contents',
             # see the comment above
-            'changes',
-            'build_queue_files',
+            #'changes',
+            #'build_queue_files',
         )
 
         views = (