Merge commit 'djpig/djpig' into merge

* commit 'djpig/djpig':
  Fix error in SQLA mapper setup

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

diff --git a/daklib/dbconn.py b/daklib/dbconn.py
index d8dfe9c176362f4ba64e2fc023aa7f0831378bc6..9e5afec7444cb36dfbbfc6632e38a4c91ecaf84f 100755 (executable)
--- a/daklib/dbconn.py
+++ b/daklib/dbconn.py
@@ -2375,7 +2375,7 @@ class DBConn(Singleton):
                                  files = relation(KnownChangePendingFile, backref="changesfile")))
 
         mapper(KnownChangePendingFile, self.tbl_changes_pending_files,
-               properties = dict(known_change_pending_file_id = self.tbl_changes_pending_files.id))
+               properties = dict(known_change_pending_file_id = self.tbl_changes_pending_files.c.id))
 
         mapper(KeyringACLMap, self.tbl_keyring_acl_map,
                properties = dict(keyring_acl_map_id = self.tbl_keyring_acl_map.c.id,