Merge branch 'master' into security

[dak.git] / dak / generate_releases.py

diff --git a/dak/generate_releases.py b/dak/generate_releases.py
index b0954fe03346460704f7580baa13555cfd1c8309..15ad1244163c511632ff283144026318171b95d3 100755 (executable)
--- 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"),
@@ -227,7 +229,7 @@ def main ():
 
         architectures = get_suite_architectures(suite, skipall=True, skipsrc=True)
 
-        if SuiteBlock.has_key("NotAutomatic"):
+        if suiteobj.notautomatic:
             notautomatic = "yes"
         else:
             notautomatic = ""
@@ -266,8 +268,8 @@ def main ():
             out.write("Codename: %s\n" % (codename))
         out.write("Date: %s\n" % (time.strftime("%a, %d %b %Y %H:%M:%S UTC", time.gmtime(time.time()))))
 
-        if SuiteBlock.has_key("ValidTime"):
-            validtime=float(SuiteBlock["ValidTime"])
+        if suiteobj.validtime:
+            validtime=float(suiteobj.validtime)
             out.write("Valid-Until: %s\n" % (time.strftime("%a, %d %b %Y %H:%M:%S UTC", time.gmtime(time.time()+validtime))))
 
         if notautomatic != "":
@@ -371,21 +373,26 @@ 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):
                 os.unlink(dest)
+            inlinedest = Cnf["Dir::Root"] + tree + "/InRelease"
+            if os.path.exists(inlinedest):
+                os.unlink(inlinedest)
 
             for keyid in signkeyids:
-                if keyid != "": defkeyid = "--default-key %s" % keyid
-                else: defkeyid = ""
+                if keyid != "":
+                    defkeyid = "--default-key %s" % keyid
+                else:
+                    defkeyid = ""
                 os.system("gpg %s %s %s --detach-sign <%s >>%s" %
                         (keyring, defkeyid, arguments,
                         Cnf["Dir::Root"] + tree + "/Release", dest))
+                os.system("gpg %s %s %s --clearsign <%s >>%s" %
+                        (keyring, defkeyid, arguments,
+                        Cnf["Dir::Root"] + tree + "/Release", inlinedest))
 
 #######################################################################################