X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=ziyi;h=102101908ceea79f9356f9b90b3f45e0472107ca;hb=c5617d291dc17395a9d23c757d7dc815f6eed49e;hp=a3af2789e531cd14456682791fa5aa4356804e22;hpb=80190aeb550bbba88b97e8754142b7e4bcfcea54;p=dak.git diff --git a/ziyi b/ziyi index a3af2789..10210190 100755 --- a/ziyi +++ b/ziyi @@ -3,7 +3,7 @@ # Create all the Release files # Copyright (C) 2001, 2002 Anthony Towns -# $Id: ziyi,v 1.22 2002-06-08 00:18:47 troup Exp $ +# $Id: ziyi,v 1.26 2003-07-15 09:43:18 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,10 +37,12 @@ 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) @@ -49,9 +51,9 @@ Generate Release files. 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 +81,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 +91,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 +120,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 +131,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 +145,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 +175,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,17 +192,17 @@ 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)): files.append(file) @@ -222,7 +225,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 +245,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 +281,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 = [""]