Merge branch 'new-dm'

diff --git a/dak/clean_suites.py b/dak/clean_suites.py
index 58b85d102c9392ae241b637a9d817053a895d18a..4fe2c5fdf12cf9822061f06b8e38a79cff75155a 100755 (executable)
--- a/dak/clean_suites.py
+++ b/dak/clean_suites.py
@@ -364,7 +364,8 @@ def clean_fingerprints(now_date, session):
 SELECT f.id, f.fingerprint FROM fingerprint f
   WHERE f.keyring IS NULL
     AND NOT EXISTS (SELECT 1 FROM binaries b WHERE b.sig_fpr = f.id)
-    AND NOT EXISTS (SELECT 1 FROM source s WHERE s.sig_fpr = f.id)""")
+    AND NOT EXISTS (SELECT 1 FROM source s WHERE s.sig_fpr = f.id)
+    AND NOT EXISTS (SELECT 1 FROM acl_per_source aps WHERE aps.created_by_id = f.id)""")
 
     count = 0
 

diff --git a/dak/dakdb/update90.py b/dak/dakdb/update90.py
new file mode 100644 (file)
index 0000000..9b70e98
--- /dev/null
+++ b/dak/dakdb/update90.py
@@ -0,0 +1,49 @@
+#!/usr/bin/env python
+# coding=utf8
+
+"""
+add created_by_id and created columns to acl_per_source table
+
+@contact: Debian FTP Master <ftpmaster@debian.org>
+@copyright: 2012 Ansgar Burchardt <ansgar@debian.org>
+@license: GNU General Public License version 2 or later
+"""
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+################################################################################
+
+import psycopg2
+from daklib.dak_exceptions import DBUpdateError
+from daklib.config import Config
+
+################################################################################
+def do_update(self):
+    print __doc__
+    try:
+        cnf = Config()
+
+        c = self.db.cursor()
+
+        c.execute("""ALTER TABLE acl_per_source
+                     ADD COLUMN created_by_id INTEGER REFERENCES fingerprint(id),
+                     ADD COLUMN created TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP""")
+
+        c.execute("UPDATE config SET value = '90' WHERE name = 'db_revision'")
+        self.db.commit()
+
+    except psycopg2.ProgrammingError as msg:
+        self.db.rollback()
+        raise DBUpdateError('Unable to apply sick update 90, rollback issued. Error message: {0}'.format(msg))

diff --git a/dak/process_commands.py b/dak/process_commands.py
index 7e013dcd0b93dbdff882cbf9db84235be5514863..a4ae1f505dab130d65ef53adfb6f0c09c16d377d 100644 (file)
--- a/dak/process_commands.py
+++ b/dak/process_commands.py
@@ -41,7 +41,7 @@ def main(argv=None):
                  ('d', 'directory', 'Process-Commands::Options::Directory', 'HasArg')]
 
     cnf = Config()
-    cnf['Process-Command::Options::Dummy'] = ''
+    cnf['Process-Commands::Options::Dummy'] = ''
     filenames = apt_pkg.parse_commandline(cnf.Cnf, arguments, argv)
     options = cnf.subtree('Process-Commands::Options')
 

diff --git a/dak/update_db.py b/dak/update_db.py
index 97efd3fb68ecc8bbd786f177d150c8d069d743c3..ea364a77cdf57a0bab8d97883b1bd4af9966203f 100755 (executable)
--- a/dak/update_db.py
+++ b/dak/update_db.py
@@ -46,7 +46,7 @@ from daklib.daklog import Logger
 ################################################################################
 
 Cnf = None
-required_database_schema = 89
+required_database_schema = 90
 
 ################################################################################
 

diff --git a/daklib/archive.py b/daklib/archive.py
index c2cc8392777ce9750e501b6a6e01bb308f301f4a..ae8516ff7250339cf9fb49adacf74b6fdb99d3cd 100644 (file)
--- a/daklib/archive.py
+++ b/daklib/archive.py
@@ -699,7 +699,7 @@ class ArchiveUpload(object):
                 if src == suite_name:
                     suite_name = dst
                     if rtype != "silent-map":
-                        self.warnings.append('Mapping {0} to {0}.'.format(src, dst))
+                        self.warnings.append('Mapping {0} to {1}.'.format(src, dst))
             elif rtype == "ignore":
                 ignored = fields[1]
                 if suite_name == ignored:

diff --git a/daklib/command.py b/daklib/command.py
index 31551d7536162377c86dc1e3585a3d079439f8e5..639611c2a7ee5c1cbc82c09b94279beee0319483 100644 (file)
--- a/daklib/command.py
+++ b/daklib/command.py
@@ -72,6 +72,8 @@ class CommandFile(object):
 
             if action == 'dm':
                 self.action_dm(self.fingerprint, section, session)
+            elif action == 'break-the-archive':
+                self.action_break_the_archive(self.fingerprint, section, session)
             else:
                 raise CommandError('Unknown action: {0}'.format(action))
         except StopIteration:
@@ -206,6 +208,8 @@ class CommandFile(object):
                 aps.acl = acl
                 aps.fingerprint = fpr
                 aps.source = source
+                aps.created_by = fingerprint
+                aps.reason = section.get('Reason')
                 session.add(aps)
                 self.log.log(['dm', 'allow', fpr.fingerprint, source])
                 self.result.append('Allowed: {0}'.format(source))
@@ -220,3 +224,11 @@ class CommandFile(object):
             self.result.append('Denied: {0}'.format(source))
 
         session.commit()
+
+    def action_break_the_archive(self, fingerprint, section, session):
+        name = 'Dave'
+        uid = fingerprint.uid
+        if uid is not None and uid.name is not None:
+            name = uid.name.split()[0]
+
+        self.result.append("DAK9000: I'm sorry, {0}. I'm afraid I can't do that.".format(name))

diff --git a/daklib/dbconn.py b/daklib/dbconn.py
index 5217462af4688754d960126e887b4203084e2766..7c1feed635c49a34b616aa548b8ccb1362d914cf 100644 (file)
--- a/daklib/dbconn.py
+++ b/daklib/dbconn.py
@@ -2630,7 +2630,8 @@ class DBConn(object):
         mapper(ACLPerSource, self.tbl_acl_per_source,
                properties = dict(
                 acl = relation(ACL),
-                fingerprint = relation(Fingerprint),
+                fingerprint = relation(Fingerprint, primaryjoin=(self.tbl_acl_per_source.c.fingerprint_id == self.tbl_fingerprint.c.id)),
+                created_by = relation(Fingerprint, primaryjoin=(self.tbl_acl_per_source.c.created_by_id == self.tbl_fingerprint.c.id)),
                 ))
 
         mapper(Archive, self.tbl_archive,

diff --git a/tools/debianqueued-0.9/debianqueued b/tools/debianqueued-0.9/debianqueued
index 3e6400f827f15da5ee4084a7c04e945ac149027d..45f1242781fe7bc54948fa66a19ad215957b2e22 100755 (executable)
--- a/tools/debianqueued-0.9/debianqueued
+++ b/tools/debianqueued-0.9/debianqueued
@@ -1132,6 +1132,8 @@ outer_loop: while (<CHANGES>) {
 sub process_dak_commands {
   my $commands = shift;
 
+  msg("log", "processing ${main::current_incoming_short}/$commands\n");
+
   # TODO: get mail address from signed contents
   # and NOT implement a third parser for armored PGP...
   $main::mail_addr = undef;