From: Ansgar Burchardt <ansgar@debian.org>
Date: Wed, 19 Sep 2012 15:31:30 +0000 (+0200)
Subject: Keep track who adds entries to DM upload table (and when).
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d52859a59eec1f7bda3cdbd9cf2894ca280fa66;p=dak

Keep track who adds entries to DM upload table (and when).
---

diff --git a/dak/clean_suites.py b/dak/clean_suites.py
index 58b85d10..4fe2c5fd 100755
--- 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
index 00000000..9b70e98a
--- /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/update_db.py b/dak/update_db.py
index 97efd3fb..ea364a77 100755
--- 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/command.py b/daklib/command.py
index 31551d75..74d20568 100644
--- a/daklib/command.py
+++ b/daklib/command.py
@@ -206,6 +206,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))
diff --git a/daklib/dbconn.py b/daklib/dbconn.py
index 5217462a..7c1feed6 100644
--- 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,