Merge remote branch 'mhy/master'

diff --git a/config/backports/dak.conf b/config/backports/dak.conf
index 82af9cadace0cda0d295919de53dda997abb3795..d019f8774a425ea45a45d0e7453f2fa4e70bfc19 100644 (file)
--- a/config/backports/dak.conf
+++ b/config/backports/dak.conf
@@ -1,10 +1,5 @@
 Dinstall
 {
-   // Both need to be defined at the moment, but they can point to the
-   // same file.
-   GPGKeyring {
-      "/srv/backports-master.debian.org/keyrings/keyring.gpg";
-   };
    // To sign the release files. Adjust the keyid!
    // Note: Key must be without a passphrase or it wont work automagically!
    SigningKeyring "/srv/backports-master.debian.org/s3kr1t/dot-gnupg/secring.gpg";

diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index 8ef7060f7104961280681640b348c9ce90f2ec84..1cf71a26c7de85382168176c3eb26f91547fd86b 100644 (file)
--- a/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@ -1,8 +1,5 @@
 Dinstall
 {
-   GPGKeyring {
-     "/srv/keyring.debian.org/keyrings/debian-keyring.gpg";
-   };
    // was non-us.d.o path before
    SigningKeyring "/srv/security-master.debian.org/s3kr1t/dot-gnupg/secring.gpg";
    SigningPubKeyring "/srv/security-master.debian.org/s3kr1t/dot-gnupg/pubring.gpg";
@@ -111,11 +108,6 @@ Rm
   LogFile "/srv/security-master.debian.org/dak-log/removals.txt";
 };
 
-Init-Archive
-{
-  ExportDir "/srv/security-master.debian.org/dak/import-archive-files/";
-};
-
 Clean-Suites
 {
   // How long (in seconds) dead packages are left before being killed

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 2f2ddc8e810c82d43437cad2f37089ebd2c5356d..f978505c4025848120aec3d2f2dbe8d5e5eadc9e 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -1,9 +1,5 @@
 Dinstall
 {
-   GPGKeyring {
-      "/srv/keyring.debian.org/keyrings/debian-keyring.gpg";
-      "/srv/keyring.debian.org/keyrings/debian-maintainers.gpg";
-   };
    SigningKeyring "/srv/ftp-master.debian.org/s3kr1t/dot-gnupg/secring.gpg";
    SigningPubKeyring "/srv/ftp-master.debian.org/s3kr1t/dot-gnupg/pubring.gpg";
 //   SendmailCommand "/usr/sbin/sendmail -odq -oi -t -f envelope@ftp-master.debian.org";

diff --git a/dak/dakdb/update63.py b/dak/dakdb/update63.py
new file mode 100755 (executable)
index 0000000..9b1187c
--- /dev/null
+++ b/dak/dakdb/update63.py
@@ -0,0 +1,59 @@
+#!/usr/bin/env python
+# coding=utf8
+
+"""
+Add missing PrimaryMirror field to archive table
+
+@contact: Debian FTP Master <ftpmaster@debian.org>
+@copyright: 2011 Mark Hymers <mhy@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):
+    """
+    Add missing PrimaryMirror field to archive table
+    """
+    print __doc__
+    try:
+        cnf = Config()
+
+        c = self.db.cursor()
+
+        c.execute("ALTER TABLE archive ADD COLUMN primary_mirror TEXT")
+
+        c.execute("SELECT id, name FROM archive")
+
+        query = "UPDATE archive SET primary_mirror = %s WHERE id = %s"
+        for a_id, a_name in c.fetchall():
+            if cnf.has_key('Archive::%s::PrimaryMirror' % a_name):
+                primloc = cnf['Archive::%s::PrimaryMirror' % a_name]
+                print "Setting archive %s PrimaryMirror to %s" % (a_name, primloc)
+                c.execute(query, [primloc, a_id])
+
+        c.execute("UPDATE config SET value = '63' WHERE name = 'db_revision'")
+        self.db.commit()
+
+    except psycopg2.ProgrammingError, msg:
+        self.db.rollback()
+        raise DBUpdateError, 'Unable to apply sick update 63, rollback issued. Error message : %s' % (str(msg))

diff --git a/dak/update_db.py b/dak/update_db.py
index fb7f142b11f11db83379002cd3f4af02611f26db..cd34e63ef83fd7641c359d3e70ac8290fddda1f8 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 = 62
+required_database_schema = 63
 
 ################################################################################