Get rid of overridesuite and validtime in dak.conf

[dak.git] / dak / generate_releases.py

diff --git a/dak/generate_releases.py b/dak/generate_releases.py
index d9db95d11259ccf690a10569330190fc70e71a6a..04627fc458ffc78d36e1f53de3ab684945ea2b4c 100755 (executable)
--- a/dak/generate_releases.py
+++ b/dak/generate_releases.py
@@ -1,9 +1,12 @@
 #!/usr/bin/env python
 
-""" Create all the Release files """
-
-# Copyright (C) 2001, 2002, 2006  Anthony Towns <ajt@debian.org>
+""" Create all the Release files
 
+@contact: Debian FTPMaster <ftpmaster@debian.org>
+@Copyright: 2001, 2002, 2006  Anthony Towns <ajt@debian.org>
+@copyright: 2009  Joerg Jaspert <joerg@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
@@ -22,8 +25,12 @@
 
 ################################################################################
 
-import sys, os, stat, time
-import gzip, bz2
+import sys
+import os
+import stat
+import time
+import gzip
+import bz2
 import apt_pkg
 
 from daklib import utils
@@ -198,8 +205,12 @@ def main ():
     for suitename in suites:
         print "Processing: " + suitename
         SuiteBlock = Cnf.SubTree("Suite::" + suitename)
-        suiteobj = get_suite(suitename)
+        suiteobj = get_suite(suitename.lower())
+        if not suiteobj:
+            print "ALERT: Cannot find suite %s!" % (suitename.lower())
+            continue
 
+        # Use the canonical name
         suite = suiteobj.suite_name.lower()
 
         if suiteobj.untouchable and not Options["Force-Touch"]:
@@ -216,7 +227,7 @@ def main ():
 
         architectures = get_suite_architectures(suite, skipall=True, skipsrc=True)
 
-        if SuiteBlock.has_key("NotAutomatic"):
+        if suiteobj.notautomatic:
             notautomatic = "yes"
         else:
             notautomatic = ""
@@ -255,8 +266,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 != "":
@@ -368,13 +379,21 @@ def main ():
             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))
 
 #######################################################################################