]> git.decadent.org.uk Git - dak.git/blobdiff - ziyi
Add new top level directories
[dak.git] / ziyi
diff --git a/ziyi b/ziyi
index a3af2789e531cd14456682791fa5aa4356804e22..49a19fb77a48bfc417f17d5b49b5ea3f93b3f09d 100755 (executable)
--- a/ziyi
+++ b/ziyi
@@ -3,7 +3,7 @@
 # Create all the Release files
 
 # Copyright (C) 2001, 2002  Anthony Towns <ajt@debian.org>
-# $Id: ziyi,v 1.22 2002-06-08 00:18:47 troup Exp $
+# $Id: ziyi,v 1.27 2005-11-15 09:50:32 ajt Exp $
 
 # 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
@@ -23,7 +23,7 @@
 
 ################################################################################
 
-import sys, os, popen2, tempfile, stat, string, time
+import sys, os, popen2, tempfile, stat, time
 import utils
 import apt_pkg
 
@@ -37,21 +37,30 @@ AptCnf = None
 ################################################################################
 
 def usage (exit_code=0):
-    print """Usage: ziyi [OPTION]
-Generate Release files.
+    print """Usage: ziyi [OPTION]... [SUITE]...
+Generate Release files (for SUITE).
 
-  -h, --help                 show this help and exit"""
+  -h, --help                 show this help and exit
+
+If no SUITE is given Release files are generated for all suites."""
 
     sys.exit(exit_code)
 
 ################################################################################
 
+def add_tiffani (files, path, indexstem):
+    index = "%s.diff/Index" % (indexstem)
+    filepath = "%s/%s" % (path, index)
+    if os.path.exists(filepath):
+        #print "ALERT: there was a tiffani file %s" % (filepath)
+        files.append(index)
+
 def compressnames (tree,type,file):
     compress = AptCnf.get("%s::%s::Compress" % (tree,type), AptCnf.get("Default::%s::Compress" % (type), ". gzip"))
     result = []
-    cl = string.split(compress)
+    cl = compress.split()
     uncompress = ("." not in cl)
-    for mode in string.split(compress):
+    for mode in compress.split():
        if mode == ".":
            result.append(file)
        elif mode == "gzip":
@@ -79,7 +88,7 @@ def create_temp_file (cmd):
            del x,r
            break
        f.write(x)
-       size = size + len(x)
+       size += len(x)
     f.flush()
     f.seek(0)
     return (size, f)
@@ -89,8 +98,8 @@ def print_md5sha_files (tree, files, hashop):
     for name in files:
         try:
            if name[0] == "<":
-               j = string.index(name, "/")
-               k = string.index(name, ">")
+               j = name.index("/")
+               k = name.index(">")
                (cat, ext, name) = (name[1:j], name[j+1:k], name[k+1:])
                (size, file_handle) = create_temp_file("%s %s%s%s" %
                    (cat, path, name, ext))
@@ -118,9 +127,6 @@ def main ():
 
     Cnf = utils.get_conf()
 
-    AptCnf = apt_pkg.newConfiguration()
-    apt_pkg.ReadConfigFileISC(AptCnf,utils.which_apt_conf_file())
-
     Arguments = [('h',"help","Ziyi::Options::Help")];
     for i in [ "help" ]:
        if not Cnf.has_key("Ziyi::Options::%s" % (i)):
@@ -132,6 +138,9 @@ def main ():
     if Options["Help"]:
        usage();
 
+    AptCnf = apt_pkg.newConfiguration()
+    apt_pkg.ReadConfigFileISC(AptCnf,utils.which_apt_conf_file())
+
     if not suites:
         suites = Cnf.SubTree("Suite").List()
 
@@ -143,7 +152,7 @@ def main ():
             print "Skipping: " + suite + " (untouchable)"
             continue
 
-       suite = string.lower(suite)
+       suite = suite.lower()
 
        origin = SuiteBlock["Origin"]
        label = SuiteBlock.get("Label", origin)
@@ -173,7 +182,8 @@ def main ():
        elif AptCnf.has_key("bindirectory::%s" % (tree)):
            pass
        else:
-           print "ALERT: suite %s not in apt.conf, nor untouchable!" % (suite)
+            aptcnf_filename = os.path.basename(utils.which_apt_conf_file());
+           print "ALERT: suite %s not in %s, nor untouchable!" % (suite, aptcnf_filename);
            continue
 
        print Cnf["Dir::Root"] + tree + "/Release"
@@ -189,20 +199,22 @@ def main ():
        out.write("Date: %s\n" % (time.strftime("%a, %d %b %Y %H:%M:%S UTC", time.gmtime(time.time()))))
        if notautomatic != "":
            out.write("NotAutomatic: %s\n" % (notautomatic))
-       out.write("Architectures: %s\n" % (string.join(filter(utils.real_arch, SuiteBlock.ValueList("Architectures")))))
+       out.write("Architectures: %s\n" % (" ".join(filter(utils.real_arch, SuiteBlock.ValueList("Architectures")))))
        if components:
-            out.write("Components: %s\n" % (string.join(components)))
+            out.write("Components: %s\n" % (" ".join(components)))
 
        out.write("Description: %s\n" % (SuiteBlock["Description"]))
 
        files = []
 
        if AptCnf.has_key("tree::%s" % (tree)):
-           for sec in string.split(AptCnf["tree::%s::Sections" % (tree)]):
-               for arch in string.split(AptCnf["tree::%s::Architectures" % (tree)]):
+           for sec in AptCnf["tree::%s::Sections" % (tree)].split():
+               for arch in AptCnf["tree::%s::Architectures" % (tree)].split():
                    if arch == "source":
-                       for file in compressnames("tree::%s" % (tree), "Sources", "%s/%s/Sources" % (sec, arch)):
+                       filepath = "%s/%s/Sources" % (sec, arch)
+                       for file in compressnames("tree::%s" % (tree), "Sources", filepath):
                            files.append(file)
+                       add_tiffani(files, Cnf["Dir::Root"] + tree, filepath)
                    else:
                        disks = "%s/disks-%s" % (sec, arch)
                        diskspath = Cnf["Dir::Root"]+tree+"/"+disks
@@ -211,8 +223,10 @@ def main ():
                                if os.path.exists("%s/%s/md5sum.txt" % (diskspath, dir)):
                                    files.append("%s/%s/md5sum.txt" % (disks, dir))
 
-                       for file in compressnames("tree::%s" % (tree), "Packages", "%s/binary-%s/Packages" % (sec, arch)):
+                       filepath = "%s/binary-%s/Packages" % (sec, arch)
+                       for file in compressnames("tree::%s" % (tree), "Packages", filepath):
                            files.append(file)
+                       add_tiffani(files, Cnf["Dir::Root"] + tree, filepath)
 
                    if arch == "source":
                        rel = "%s/%s/Release" % (sec, arch)
@@ -222,7 +236,7 @@ def main ():
 
                     try:
                         release = open(relpath, "w")
-                        #release = open(string.replace(longsuite,"/","_") + "_" + arch + "_" + sec + "_Release", "w")
+                        #release = open(longsuite.replace("/","_") + "_" + arch + "_" + sec + "_Release", "w")
                     except IOError:
                         utils.fubar("Couldn't write to " + relpath);
 
@@ -242,20 +256,30 @@ def main ():
                     files.append(rel)
 
            if AptCnf.has_key("tree::%s/main" % (tree)):
-               sec = string.split(AptCnf["tree::%s/main::Sections" % (tree)])[0]
+               sec = AptCnf["tree::%s/main::Sections" % (tree)].split()[0]
                if sec != "debian-installer":
                    print "ALERT: weird non debian-installer section in %s" % (tree)
 
-               for arch in string.split(AptCnf["tree::%s/main::Architectures" % (tree)]):
+               for arch in AptCnf["tree::%s/main::Architectures" % (tree)].split():
                    if arch != "source":  # always true
                        for file in compressnames("tree::%s/main" % (tree), "Packages", "main/%s/binary-%s/Packages" % (sec, arch)):
                            files.append(file)
+           elif AptCnf.has_key("tree::%s::FakeDI" % (tree)):
+               usetree = AptCnf["tree::%s::FakeDI" % (tree)]
+               sec = AptCnf["tree::%s/main::Sections" % (usetree)].split()[0]
+               if sec != "debian-installer":
+                   print "ALERT: weird non debian-installer section in %s" % (usetree)
+               for arch in AptCnf["tree::%s/main::Architectures" % (usetree)].split():
+                   if arch != "source":  # always true
+                       for file in compressnames("tree::%s/main" % (usetree), "Packages", "main/%s/binary-%s/Packages" % (sec, arch)):
+                           files.append(file)
 
        elif AptCnf.has_key("bindirectory::%s" % (tree)):
            for file in compressnames("bindirectory::%s" % (tree), "Packages", AptCnf["bindirectory::%s::Packages" % (tree)]):
-               files.append(string.replace(file,tree+"/","",1))
+               files.append(file.replace(tree+"/","",1))
            for file in compressnames("bindirectory::%s" % (tree), "Sources", AptCnf["bindirectory::%s::Sources" % (tree)]):
-               files.append(string.replace(file,tree+"/","",1))
+               files.append(file.replace(tree+"/","",1))
        else:
            print "ALERT: no tree/bindirectory for %s" % (tree)
 
@@ -268,11 +292,11 @@ def main ():
        if Cnf.has_key("Dinstall::SigningKeyring"):
            keyring = "--secret-keyring \"%s\"" % Cnf["Dinstall::SigningKeyring"]
            if Cnf.has_key("Dinstall::SigningPubKeyring"):
-               keyring = keyring + " --keyring \"%s\"" % Cnf["Dinstall::SigningPubKeyring"]
+               keyring += " --keyring \"%s\"" % Cnf["Dinstall::SigningPubKeyring"]
 
            arguments = "--no-options --batch --no-tty --armour"
            if Cnf.has_key("Dinstall::SigningKeyIds"):
-               signkeyids = string.split(Cnf["Dinstall::SigningKeyIds"])
+               signkeyids = Cnf["Dinstall::SigningKeyIds"].split()
            else:
                signkeyids = [""]