Merge remote branch 'mhy/master'

diff --git a/config/backports/dak.conf b/config/backports/dak.conf
index a9f4886c9627275b4844bbb76ceb16d5ebd5d415..82af9cadace0cda0d295919de53dda997abb3795 100644 (file)
--- a/config/backports/dak.conf
+++ b/config/backports/dak.conf
@@ -36,7 +36,6 @@ Dinstall
    DefaultSuite "lenny-backports";
    Reject
    {
-     NoSourceOnly "true";
      ReleaseTransitions "/srv/backports-master.debian.org/hints/transitions.yaml";
    };
    // If set, only send mails to addresses listed there.
@@ -139,8 +138,6 @@ Control-Overrides
     Suite "lenny-backports";
     Type "deb";
    };
-
- ComponentPosition "prefix"; // Whether the component is prepended or appended to the section name
 };
 
 Rm

diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index fb23848eed79e396c039234f06554070a12ae081..6c4c5c6b852bb4b1d05d949ecc3d04c6b4cf6bbb 100644 (file)
--- a/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@ -34,6 +34,7 @@ Dinstall
    SuiteSuffix "updates/";
    OverrideMaintainer "dak@security.debian.org";
    LegacyStableHasNoSections "false";
+   AllowSourceOnlyUploads "true";
 };
 
 Process-New

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 293df65dc1eaac04fbde44f2196e2fc78742527a..89ca01e48322a11422a0cd3826db53433199ea8c 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -27,7 +27,6 @@ Dinstall
    LintianTags "/srv/ftp-master.debian.org/dak/config/debian/lintian.tags";
    Reject
    {
-     NoSourceOnly "true";
      ReleaseTransitions "/srv/ftp.debian.org/web/transitions.yaml";
    };
    // if you setup an own dak repository and want to upload Debian packages you most possibly want
@@ -89,8 +88,6 @@ Control-Overrides
     Suite "unstable";
     Type "deb";
    };
-
- ComponentPosition "prefix"; // Whether the component is prepended or appended to the section name
 };
 
 Rm

diff --git a/dak/add_user.py b/dak/add_user.py
index f087849c8bd507653af2c7af8c357bc1fc767bb8..f2391bd65acf59cf64a9613b4c5fbeb111dbb060 100755 (executable)
--- a/dak/add_user.py
+++ b/dak/add_user.py
@@ -22,7 +22,7 @@ import sys
 import apt_pkg
 
 from daklib import utils
-from daklib.dbconn import DBConn, get_or_set_uid
+from daklib.dbconn import DBConn, get_or_set_uid, get_active_keyring_paths
 from daklib.regexes import re_gpg_fingerprint_colon, re_user_address, re_user_mails, re_user_name
 
 ################################################################################
@@ -124,7 +124,7 @@ def main():
     session = DBConn().session()
 
     if not keyrings:
-        keyrings = Cnf.ValueList("Dinstall::GPGKeyring")
+        keyrings = get_active_keyring_paths()
 
     cmd = "gpg --with-colons --no-secmem-warning --no-auto-check-trustdb --no-default-keyring %s --with-fingerprint --list-key %s" \
            % (utils.gpg_keyring_args(keyrings),

diff --git a/daklib/queue.py b/daklib/queue.py
index 63375f2d413a766baac4f1b54435b4a013f67710..c5cd4a68b8595992bfeeafd2ebdd2fc30bdf12cb 100755 (executable)
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -751,7 +751,7 @@ class Upload(object):
             self.rejects.append("%s: invalid version number '%s'." % (f, version))
 
         # Ensure the architecture of the .deb is one we know about.
-        default_suite = cnf.get("Dinstall::DefaultSuite", "Unstable")
+        default_suite = cnf.get("Dinstall::DefaultSuite", "unstable")
         architecture = control.Find("Architecture")
         upload_suite = self.pkg.changes["distribution"].keys()[0]
 
@@ -1108,7 +1108,7 @@ class Upload(object):
             if not has_source:
                 self.rejects.append("no source found and Architecture line in changes mention source.")
 
-            if not has_binaries and cnf.FindB("Dinstall::Reject::NoSourceOnly"):
+            if (not has_binaries) and (not cnf.FindB("Dinstall::AllowSourceOnlyUploads")):
                 self.rejects.append("source only uploads are not supported.")
 
     ###########################################################################

diff --git a/daklib/utils.py b/daklib/utils.py
index 413bcb6dcc79b51f245ee87a151216953c28713b..133500c66fc90883a6be95c6b535fbb6302fee78 100755 (executable)
--- a/daklib/utils.py
+++ b/daklib/utils.py
@@ -39,7 +39,10 @@ import re
 import email as modemail
 import subprocess
 
-from dbconn import DBConn, get_architecture, get_component, get_suite, get_override_type, Keyring, session_wrapper
+from dbconn import DBConn, get_architecture, get_component, get_suite, \
+                   get_override_type, Keyring, session_wrapper, \
+                   get_active_keyring_paths, get_primary_keyring_path
+from sqlalchemy import desc
 from dak_exceptions import *
 from gpg import SignedFile
 from textutils import fix_maintainer
@@ -1250,7 +1253,7 @@ def retrieve_key (filename, keyserver=None, keyring=None):
     if not keyserver:
         keyserver = Cnf["Dinstall::KeyServer"]
     if not keyring:
-        keyring = Cnf.ValueList("Dinstall::GPGKeyring")[0]
+        keyring = get_primary_keyring_path()
 
     # Ensure the filename contains no shell meta-characters or other badness
     if not re_taint_free.match(filename):
@@ -1287,7 +1290,7 @@ def retrieve_key (filename, keyserver=None, keyring=None):
 
 def gpg_keyring_args(keyrings=None):
     if not keyrings:
-        keyrings = Cnf.ValueList("Dinstall::GPGKeyring")
+        keyrings = get_active_keyring_paths()
 
     return " ".join(["--keyring %s" % x for x in keyrings])
 

diff --git a/docs/README.config b/docs/README.config
index ee0dc0d642b83641e8b107b7d5cd5e054add7dd4..a6b71206056e6142b457944cd8c60854498196cc 100644 (file)
--- a/docs/README.config
+++ b/docs/README.config
@@ -191,15 +191,10 @@ Mandatory.  List of dinstall options, e.g.:
 
 | Dinstall
 | {
-|    GPGKeyring {
-|       "/org/keyring.debian.org/keyrings/debian-keyring.gpg";
-|       "/org/keyring.debian.org/keyrings/debian-keyring.pgp";
-|    };
 |    SigningKeyring "/org/ftp.debian.org/s3kr1t/dot-gnupg/secring.gpg";
 |    SendmailCommand "/usr/sbin/sendmail -odq -oi -t";
 |    MyEmailAddress "Debian Installer <installer@ftp-master.debian.org>";
 |    MyAdminAddress "ftpmaster@debian.org";
-|    MyHost "debian.org";  // used for generating user@my_host addresses in e.g. manual_reject()
 |    MyDistribution "Debian";
 |    BugServer "bugs.debian.org";
 |    PackagesServer "packages.debian.org";
@@ -211,9 +206,6 @@ Mandatory.  List of dinstall options, e.g.:
 |    BXANotify "false";
 | };
 
-GPGKeyring (required): filenames of the PGP and GnuPG
-keyrings to be used by dak.
-
 SigningKeyring (optional): this is the private keyring used by 'dak
 generate-releases'.