Merge commit 'ftpmaster/master'

Conflicts:
	daklib/dbconn.py

Signed-off-by: Mark Hymers <mhy@debian.org>

diff --cc daklib/dbconn.py
index 0f4d4ede271627e21d8536e2296d9741eb1255d8,9e5afec7444cb36dfbbfc6632e38a4c91ecaf84f..5b30fce99612469c74991d42fe3fbc5871ff532e
--- 1/daklib/dbconn.py
--- 2/daklib/dbconn.py
+++ b/daklib/dbconn.py
@@@ -2616,26 -2372,11 +2616,25 @@@ class DBConn(Singleton)
                                   poolfiles = relation(PoolFile,
                                                        secondary=self.tbl_changes_pool_files,
                                                        backref="changeslinks"),
 -                                 files = relation(KnownChangePendingFile, backref="changesfile")))
 +                                 files = relation(ChangePendingFile, backref="changesfile")))
  
 -        mapper(KnownChangePendingFile, self.tbl_changes_pending_files,
 -               properties = dict(known_change_pending_file_id = self.tbl_changes_pending_files.c.id))
 +        mapper(ChangePendingBinary, self.tbl_changes_pending_binary,
 +               properties = dict(change_pending_binary_id = self.tbl_changes_pending_binary.c.id))
  
- 
 +        mapper(ChangePendingFile, self.tbl_changes_pending_files,
 +               properties = dict(change_pending_file_id = self.tbl_changes_pending_files.c.id))
 +
 +        mapper(ChangePendingSource, self.tbl_changes_pending_source,
 +               properties = dict(change_pending_source_id = self.tbl_changes_pending_source.c.id,
 +                                 change = relation(KnownChange),
 +                                 maintainer = relation(Maintainer,
 +                                                       primaryjoin=(self.tbl_changes_pending_source.c.maintainer_id==self.tbl_maintainer.c.id)),
 +                                 changedby = relation(Maintainer,
 +                                                      primaryjoin=(self.tbl_changes_pending_source.c.changedby_id==self.tbl_maintainer.c.id)),
 +                                 fingerprint = relation(Fingerprint),
 +                                 source_files = relation(ChangePendingFile,
 +                                                         secondary=self.tbl_changes_pending_source_files,
 +                                                         backref="pending_sources")))
          mapper(KeyringACLMap, self.tbl_keyring_acl_map,
                 properties = dict(keyring_acl_map_id = self.tbl_keyring_acl_map.c.id,
                                   keyring = relation(Keyring, backref="keyring_acl_map"),