From: Torsten Werner <twerner@debian.org>
Date: Sat, 12 Feb 2011 15:24:15 +0000 (+0100)
Subject: Merge branch 'master' into dbtests
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=a4b3758ff560961d45155225a3af66a3c45fe8be;hp=-c;p=dak.git

Merge branch 'master' into dbtests
---

a4b3758ff560961d45155225a3af66a3c45fe8be
diff --combined daklib/dbconn.py
index 14ed7faa,67852949..94884d5c
--- a/daklib/dbconn.py
+++ b/daklib/dbconn.py
@@@ -467,11 -467,7 +467,11 @@@ __all__.append('get_archive'
  ################################################################################
  
  class BinContents(ORMObject):
 -    def properties(silf):
 +    def __init__(self, file = None, binary = None):
 +        self.file = file
 +        self.binary = binary
 +
 +    def properties(self):
          return ['file', 'binary']
  
  __all__.append('BinContents')
@@@ -2906,8 -2902,8 +2906,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 = (
@@@ -2921,8 -2917,8 +2921,8 @@@
              'suite_build_queue_copy',
              'udeb_contents',
              # see the comment above
-             'changes',
-             'build_queue_files',
+             #'changes',
+             #'build_queue_files',
          )
  
          views = (