merge with ftp-master

Signed-off-by: Mike O'Connor <stew@vireo.org>

diff --cc dak/process_new.py
Simple merge

diff --cc daklib/config.py
index c86c1b36580931bf81427b6f5c0bee48d1acd8df,c2d2fe5506c675682db0de4b464d310ca2d2fa82..2f24cd3a84aee1598092a652b3963e21252fed5e
--- 1/daklib/config.py
--- 2/daklib/config.py
+++ b/daklib/config.py
@@@ -36,11 -35,12 +36,11 @@@ from singleton import Singleto
  
  ################################################################################
  
- default_config = "/etc/dak/dak.conf"
+ default_config = "/etc/dak/dak.conf" #: default dak config, defines host properties
  
 -def which_conf_file(Cnf):
 -    res = socket.gethostbyaddr(socket.gethostname())
 -    if Cnf.get("Config::" + res[0] + "::DakConfig"):
 -        return Cnf["Config::" + res[0] + "::DakConfig"]
 +def which_conf_file():
 +    if os.getenv("DAK_CONFIG"):
 +        return os.getenv("DAK_CONFIG")
      else:
          return default_config
  

diff --cc daklib/dbconn.py
index 2b0a849254d928bc0d134d294d77a13f98ebf71c,49468a7556c250f314fe2370700f4c3cc7b2f98e..72b072c1f83bd9f07627bbf87f6f104d6c66b5bb
--- 1/daklib/dbconn.py
--- 2/daklib/dbconn.py
+++ b/daklib/dbconn.py
@@@ -2151,7 -2305,7 +2340,8 @@@ class DBConn(Singleton)
          self.tbl_files = Table('files', self.db_meta, autoload=True)
          self.tbl_fingerprint = Table('fingerprint', self.db_meta, autoload=True)
          self.tbl_keyrings = Table('keyrings', self.db_meta, autoload=True)
 +        self.tbl_known_changes = Table('known_changes', self.db_meta, autoload=True)
+         self.tbl_keyring_acl_map = Table('keyring_acl_map', self.db_meta, autoload=True)
          self.tbl_location = Table('location', self.db_meta, autoload=True)
          self.tbl_maintainer = Table('maintainer', self.db_meta, autoload=True)
          self.tbl_new_comments = Table('new_comments', self.db_meta, autoload=True)
@@@ -2254,9 -2403,11 +2439,14 @@@
                 properties = dict(keyring_name = self.tbl_keyrings.c.name,
                                   keyring_id = self.tbl_keyrings.c.id))
  
 +        mapper(KnownChange, self.tbl_known_changes,
 +               properties = dict(known_change_id = self.tbl_known_changes.c.id))
 +
+         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"),
+                                  architecture = relation(Architecture)))
+ 
          mapper(Location, self.tbl_location,
                 properties = dict(location_id = self.tbl_location.c.id,
                                   component_id = self.tbl_location.c.component,

diff --cc daklib/queue.py
Simple merge

diff --cc daklib/utils.py
Simple merge