diff --git a/config/backports/dak.conf b/config/backports/dak.conf index 993cb80da76c9cad76b254afefdf9ee0313abcb0..bfdbc8b988b69f97b84e8058253992a757036892 100644 --- a/config/backports/dak.conf +++ b/config/backports/dak.conf @@ -9,7 +9,6 @@ Dinstall // Note: Key must be without a passphrase or it wont work automagically! SigningKeyring "/srv/backports-master.debian.org/s3kr1t/dot-gnupg/secring.gpg"; SigningPubKeyring "/srv/backports-master.debian.org/s3kr1t/dot-gnupg/pubring.gpg"; - SigningKeyIds "55BE302B"; SendmailCommand "/usr/sbin/sendmail -oi -t -f envelope@ftp-master.debian.org"; MyEmailAddress "backports.debian.org archive Installer "; MyAdminAddress "ftpmaster@backports.debian.org"; diff --git a/config/debian/dak.conf b/config/debian/dak.conf index 6447388ecd89c4a9d375b3e0a7374d9f72a21f04..192a039b29f16bc6ed234aafbaad3e32f745ec6a 100644 --- a/config/debian/dak.conf +++ b/config/debian/dak.conf @@ -6,7 +6,6 @@ Dinstall }; SigningKeyring "/srv/ftp-master.debian.org/s3kr1t/dot-gnupg/secring.gpg"; SigningPubKeyring "/srv/ftp-master.debian.org/s3kr1t/dot-gnupg/pubring.gpg"; - SigningKeyIds "55BE302B"; // SendmailCommand "/usr/sbin/sendmail -odq -oi -t -f envelope@ftp-master.debian.org"; SendmailCommand "/usr/sbin/sendmail -oi -t -f envelope@ftp-master.debian.org"; MyEmailAddress "Debian FTP Masters "; diff --git a/dak/generate_releases.py b/dak/generate_releases.py index 04627fc458ffc78d36e1f53de3ab684945ea2b4c..5d7f007ba8e162c93791f32032cd3301e874ffdd 100755 --- a/dak/generate_releases.py +++ b/dak/generate_releases.py @@ -371,10 +371,7 @@ def main (): keyring += " --keyring \"%s\"" % Cnf["Dinstall::SigningPubKeyring"] arguments = "--no-options --batch --no-tty --armour" - if Cnf.has_key("Dinstall::SigningKeyIds"): - signkeyids = Cnf["Dinstall::SigningKeyIds"].split() - else: - signkeyids = [""] + signkeyids=Cnf.signingkeyids.split() dest = Cnf["Dir::Root"] + tree + "/Release.gpg" if os.path.exists(dest): diff --git a/daklib/config.py b/daklib/config.py old mode 100644 new mode 100755 index aad28d8a6f5e9260deefca63a050d2bd7176ebd4..1c3f92ba5d41ec5b4bc9a64301be8bb1a23512a6 --- a/daklib/config.py +++ b/daklib/config.py @@ -107,7 +107,9 @@ class Config(object): Of course, what the values do is another matter """ for field in [('db_revision', None, int), - ('defaultsuitename', 'unstable', str)]: + ('defaultsuitename', 'unstable', str), + ('signingkeyids', '', str) + ]: setattr(self, 'get_%s' % field[0], lambda x=None: self.get_db_value(field[0], field[1], field[2])) setattr(Config, '%s' % field[0], property(fget=getattr(self, 'get_%s' % field[0])))