Merge branch 'merge'

* merge:
  lenny's python-apt does not support "#" comments.

diff --git a/config/debian/cron.hourly b/config/debian/cron.hourly
index 34d1b59e144eba9cdc2e261d623f593d877751b7..24955023e4add65bb5da426ca25b5ec85f0ef633 100755 (executable)
--- a/config/debian/cron.hourly
+++ b/config/debian/cron.hourly
@@ -10,7 +10,7 @@ export SCRIPTVARS=/srv/ftp.debian.org/dak/config/debian/vars
 date -u > $ftpdir/project/trace/ftp-master.debian.org
 echo "Using dak v1" >> $ftpdir/project/trace/ftp-master.debian.org
 echo "Running on host: $(hostname -f)" >> $ftpdir/project/trace/ftp-master.debian.org
-#dak import-users-from-passwd
+dak import-users-from-passwd
 #dak queue-report -n > $webdir/new.html
 #dak queue-report -8 -d accepted,new,byhand,proposedupdates,oldproposedupdates
 dak show-deferred > ${webdir}/deferred.html

diff --git a/daklib/dbconn.py b/daklib/dbconn.py
index adf119bc74f8379d05fc11b3d57e794068aa76f1..f7ed0a0a30be3f402112dcc31b920de22254d3f0 100644 (file)
--- a/daklib/dbconn.py
+++ b/daklib/dbconn.py
@@ -2565,8 +2565,8 @@ class DBConn(object):
         )
 
         for table_name in tables:
-            table = Table('tbl_%s' % table_name, self.db_meta, autoload=True)
-            setattr(self, table_name, table)
+            table = Table(table_name, self.db_meta, autoload=True)
+            setattr(self, 'tbl_%s' % table_name, table)
 
     def __setupmappers(self):
         mapper(Architecture, self.tbl_architecture,
@@ -2663,8 +2663,8 @@ class DBConn(object):
                                                      primaryjoin=(self.tbl_changes.c.in_queue==self.tbl_policy_queue.c.id)),
                                  approved_for_id = self.tbl_changes.c.approved_for))
 
-        mapper(ChangePendingBinary, self.tbl_changes_pending_binary,
-               properties = dict(change_pending_binary_id = self.tbl_changes_pending_binary.c.id))
+        mapper(ChangePendingBinary, self.tbl_changes_pending_binaries,
+               properties = dict(change_pending_binary_id = self.tbl_changes_pending_binaries.c.id))
 
         mapper(ChangePendingFile, self.tbl_changes_pending_files,
                properties = dict(change_pending_file_id = self.tbl_changes_pending_files.c.id))