X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fgenerate_releases.py;h=31cae490775dafcf10bcbd9e8967a6f0ab94089f;hb=0872b2e0b78670c91fd2bf0bda52e5761e079820;hp=3f44a65f5ddd73533b91c18eea46c9519022857d;hpb=f98ee1caeb8e56f7e9dc4e5e0bdced3936ae27bd;p=dak.git

diff --git a/dak/generate_releases.py b/dak/generate_releases.py
index 3f44a65f..31cae490 100755
--- 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, pg
-import gzip, bz2
+import sys
+import os
+import stat
+import time
+import gzip
+import bz2
 import apt_pkg
 
 from daklib import utils
@@ -59,6 +66,24 @@ def add_tiffani (files, path, indexstem):
         #print "ALERT: there was a tiffani file %s" % (filepath)
         files.append(index)
 
+def gen_i18n_index (files, tree, sec):
+    path = Cnf["Dir::Root"] + tree + "/"
+    i18n_path = "%s/i18n" % (sec)
+    if os.path.exists("%s/%s" % (path, i18n_path)):
+        index = "%s/Index" % (i18n_path)
+        out = open("%s/%s" % (path, index), "w")
+        out.write("SHA1:\n")
+        for x in os.listdir("%s/%s" % (path, i18n_path)):
+            if x.startswith('Translation-'):
+                f = open("%s/%s/%s" % (path, i18n_path, x), "r")
+                size = os.fstat(f.fileno())[6]
+                f.seek(0)
+                sha1sum = apt_pkg.sha1sum(f)
+                f.close()
+                out.write(" %s %7d %s\n" % (sha1sum, size, x))
+        out.close()
+        files.append(index)
+
 def compressnames (tree,type,file):
     compress = AptCnf.get("%s::%s::Compress" % (tree,type), AptCnf.get("Default::%s::Compress" % (type), ". gzip"))
     result = []
@@ -179,22 +204,26 @@ def main ():
 
     for suitename in suites:
         print "Processing: " + suitename
-        SuiteBlock = Cnf.SubTree("Suite::" + suite)
-        suiteobj = get_suite(suitename)
+        SuiteBlock = Cnf.SubTree("Suite::" + suitename)
+        suiteobj = get_suite(suitename.lower())
+        if not suiteobj:
+            print "ALERT: Cannot find suite %s!" % (suitename.lower())
+            continue
 
-        suite = suite.suite_name.lower()
+        # Use the canonical name
+        suite = suiteobj.suite_name.lower()
 
-        if suite.untouchable and not Options["Force-Touch"]:
+        if suiteobj.untouchable and not Options["Force-Touch"]:
             print "Skipping: " + suite + " (untouchable)"
             continue
 
-        origin = suite.origin
-        label = suite.label or suite.origin
-        codename = suite.codename or ""
+        origin = suiteobj.origin
+        label = suiteobj.label or suiteobj.origin
+        codename = suiteobj.codename or ""
         version = ""
-        if suite.version and suite.version != '-':
-            version = suite.version
-        description = suite.description or ""
+        if suiteobj.version and suiteobj.version != '-':
+            version = suiteobj.version
+        description = suiteobj.description or ""
 
         architectures = get_suite_architectures(suite, skipall=True, skipsrc=True)
 
@@ -258,7 +287,10 @@ def main ():
             else:
                 for x in os.listdir("%s/%s" % (Cnf["Dir::Root"], tree)):
                     if x.startswith('Contents-'):
-                        files.append(x)
+                        if x.endswith('.diff'):
+                            files.append("%s/Index" % (x))
+                        else:
+                            files.append(x)
 
             for sec in AptCnf["tree::%s::Sections" % (tree)].split():
                 for arch in AptCnf["tree::%s::Architectures" % (tree)].split():
@@ -287,6 +319,7 @@ def main ():
                     relpath = Cnf["Dir::Root"]+tree+"/"+rel
                     write_release_file(relpath, suite, sec, origin, label, arch, version, suite_suffix, notautomatic)
                     files.append(rel)
+                gen_i18n_index(files, tree, sec)
 
             if AptCnf.has_key("tree::%s/main" % (tree)):
                 for dis in ["main", "contrib", "non-free"]:
@@ -346,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))
 
 #######################################################################################