sync

[dak.git] / ziyi

diff --git a/ziyi b/ziyi
index 350573866f08a11645b1bb822f3da28346c46ae0..a3af2789e531cd14456682791fa5aa4356804e22 100755 (executable)
--- a/ziyi
+++ b/ziyi
@@ -2,8 +2,8 @@
 
 # Create all the Release files
 
-# Copyright (C) 2001  Anthony Towns <ajt@debian.org>
-# $Id: ziyi,v 1.17 2002-02-12 22:14:38 troup Exp $
+# Copyright (C) 2001, 2002  Anthony Towns <ajt@debian.org>
+# $Id: ziyi,v 1.22 2002-06-08 00:18:47 troup 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
@@ -31,6 +31,8 @@ import apt_pkg
 
 Cnf = None
 projectB = None
+out = None
+AptCnf = None
 
 ################################################################################
 
@@ -83,7 +85,7 @@ def create_temp_file (cmd):
     return (size, f)
 
 def print_md5sha_files (tree, files, hashop):
-    path = Cnf["Dir::RootDir"] + tree + "/"
+    path = Cnf["Dir::Root"] + tree + "/"
     for name in files:
         try:
            if name[0] == "<":
@@ -133,9 +135,6 @@ def main ():
     if not suites:
         suites = Cnf.SubTree("Suite").List()
 
-    def real_arch(x):
-       return x != "source" and x != "all"
-
     for suite in suites:
         print "Processing: " + suite
        SuiteBlock = Cnf.SubTree("Suite::" + suite)
@@ -157,21 +156,15 @@ def main ():
            notautomatic = ""
 
        if SuiteBlock.has_key("Components"):
-           components = SuiteBlock.SubTree("Components").List()
+           components = SuiteBlock.ValueList("Components")
        else:
            components = []
 
-       nonus = 1
-       if components != []:
-           for c in components:
-               if string.find(c, "non-US/") != 0:
-                   nonus = 0
-       else:
-           nonus = 0
-       if nonus:
-           longsuite = suite + "/non-US"
-       else:
-           longsuite = suite
+        suite_suffix = Cnf.Find("Dinstall::SuiteSuffix");
+        if components and suite_suffix:
+            longsuite = suite + "/" + suite_suffix;
+        else:
+            longsuite = suite;
 
        tree = SuiteBlock.get("Tree", "dists/%s" % (longsuite))
 
@@ -183,8 +176,8 @@ def main ():
            print "ALERT: suite %s not in apt.conf, nor untouchable!" % (suite)
            continue
 
-       print Cnf["Dir::RootDir"] + tree + "/Release"
-       out = open(Cnf["Dir::RootDir"] + tree + "/Release", "w")
+       print Cnf["Dir::Root"] + tree + "/Release"
+       out = open(Cnf["Dir::Root"] + tree + "/Release", "w")
 
        out.write("Origin: %s\n" % (origin))
        out.write("Label: %s\n" % (label))
@@ -196,8 +189,8 @@ 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(real_arch, SuiteBlock.SubTree("Architectures").List()))))
-       if components != []:
+       out.write("Architectures: %s\n" % (string.join(filter(utils.real_arch, SuiteBlock.ValueList("Architectures")))))
+       if components:
             out.write("Components: %s\n" % (string.join(components)))
 
        out.write("Description: %s\n" % (SuiteBlock["Description"]))
@@ -212,7 +205,7 @@ def main ():
                            files.append(file)
                    else:
                        disks = "%s/disks-%s" % (sec, arch)
-                       diskspath = Cnf["Dir::RootDir"]+tree+"/"+disks
+                       diskspath = Cnf["Dir::Root"]+tree+"/"+disks
                        if os.path.exists(diskspath):
                            for dir in os.listdir(diskspath):
                                if os.path.exists("%s/%s/md5sum.txt" % (diskspath, dir)):
@@ -225,30 +218,28 @@ def main ():
                        rel = "%s/%s/Release" % (sec, arch)
                    else:
                        rel = "%s/binary-%s/Release" % (sec, arch)
-                   relpath = Cnf["Dir::RootDir"]+tree+"/"+rel
-
-                   if os.path.exists(relpath):
-                       try:
-                           os.unlink(relpath)
-                           release = open(relpath, "w")
-                           #release = open(string.replace(longsuite,"/","_") + "_" + arch + "_" + sec + "_Release", "w")
-                       except IOError:
-                           print "Couldn't write to " + relpath
-                       else:
-                           release.write("Archive: %s\n" % (suite))
-                           if version != "":
-                               release.write("Version: %s\n" % (version))
-                           if nonus:
-                               release.write("Component: non-US/%s\n" % (sec))
-                           else:
-                               release.write("Component: %s\n" % (sec))
-                           release.write("Origin: %s\n" % (origin))
-                           release.write("Label: %s\n" % (label))
-                           if notautomatic != "":
-                               release.write("NotAutomatic: %s\n" % (notautomatic))
-                           release.write("Architecture: %s\n" % (arch))
-                           release.close()
-                           files.append(rel)
+                   relpath = Cnf["Dir::Root"]+tree+"/"+rel
+
+                    try:
+                        release = open(relpath, "w")
+                        #release = open(string.replace(longsuite,"/","_") + "_" + arch + "_" + sec + "_Release", "w")
+                    except IOError:
+                        utils.fubar("Couldn't write to " + relpath);
+
+                    release.write("Archive: %s\n" % (suite))
+                    if version != "":
+                        release.write("Version: %s\n" % (version))
+                    if suite_suffix:
+                        release.write("Component: %s/%s\n" % (suite_suffix,sec));
+                    else:
+                        release.write("Component: %s\n" % (sec));
+                    release.write("Origin: %s\n" % (origin))
+                    release.write("Label: %s\n" % (label))
+                    if notautomatic != "":
+                        release.write("NotAutomatic: %s\n" % (notautomatic))
+                    release.write("Architecture: %s\n" % (arch))
+                    release.close()
+                    files.append(rel)
 
            if AptCnf.has_key("tree::%s/main" % (tree)):
                sec = string.split(AptCnf["tree::%s/main::Sections" % (tree)])[0]
@@ -285,7 +276,7 @@ def main ():
            else:
                signkeyids = [""]
 
-           dest = Cnf["Dir::RootDir"] + tree + "/Release.gpg"
+           dest = Cnf["Dir::Root"] + tree + "/Release.gpg"
            if os.path.exists(dest):
                os.unlink(dest)
 
@@ -294,7 +285,7 @@ def main ():
                else: defkeyid = ""
                os.system("gpg %s %s %s --detach-sign <%s >>%s" %
                        (keyring, defkeyid, arguments,
-                       Cnf["Dir::RootDir"] + tree + "/Release", dest))
+                       Cnf["Dir::Root"] + tree + "/Release", dest))
 
 #######################################################################################