X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fgenerate_releases.py;h=15ad1244163c511632ff283144026318171b95d3;hb=39cdc8cc1607dbacfcdbf8182e3a024c05737fe4;hp=04627fc458ffc78d36e1f53de3ab684945ea2b4c;hpb=7ae8ff5952dc012ae2adeac5699ebc0f48b9b9ff;p=dak.git diff --git a/dak/generate_releases.py b/dak/generate_releases.py index 04627fc4..15ad1244 100755 --- a/dak/generate_releases.py +++ b/dak/generate_releases.py @@ -36,6 +36,7 @@ import apt_pkg from daklib import utils from daklib.dak_exceptions import * from daklib.dbconn import * +from daklib.config import Config ################################################################################ @@ -178,6 +179,7 @@ def main (): out = sys.stdout Cnf = utils.get_conf() + cnf = Config() Arguments = [('h',"help","Generate-Releases::Options::Help"), ('a',"apt-conf","Generate-Releases::Options::Apt-Conf", "HasArg"), @@ -371,10 +373,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):