X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=ziyi;h=b129a888a14a0560843d4879e89e6761d782f4c9;hb=791e932971b92146d3621efdd29facc02b109774;hp=731fea930b03503094b130155992323fa5ee5d76;hpb=10b08271e7209664dcebc83cbca7d1106c6bd394;p=dak.git diff --git a/ziyi b/ziyi index 731fea93..b129a888 100755 --- a/ziyi +++ b/ziyi @@ -3,7 +3,7 @@ # Create all the Release files # Copyright (C) 2001 Anthony Towns -# $Id: ziyi,v 1.6 2001-05-05 07:20:57 ajt Exp $ +# $Id: ziyi,v 1.15 2001-12-18 16:26:12 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 pg, sys, os, stat, string, time +import pg, sys, os, popen2, tempfile, stat, string, time import utils, db_access import apt_pkg @@ -34,45 +34,79 @@ projectB = None ################################################################################ +def usage (exit_code=0): + print """Usage: ziyi [OPTION] +Generate Release files. + + -h, --help show this help and exit""" + + sys.exit(exit_code) + +################################################################################ + 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) + uncompress = ("." not in cl) for mode in string.split(compress): if mode == ".": result.append(file) elif mode == "gzip": + if uncompress: + result.append("" + file) + uncompress = 0 result.append(file + ".gz") elif mode == "bzip2": + if uncompress: + result.append("" + file) + uncompress = 0 result.append(file + ".bz2") return result -def print_md5_files (tree, files): +def create_temp_file (cmd): + f = tempfile.TemporaryFile() + r = popen2.popen2(cmd) + r[1].close() + r = r[0] + size = 0 + while 1: + x = r.readline() + if not x: + r.close() + del x,r + break + f.write(x) + size = size + len(x) + f.flush() + f.seek(0) + return (size, f) + +def print_md5sha_files (tree, files, hashop): path = Cnf["Dir::RootDir"] + tree + "/" for name in files: try: - file_handle = utils.open_file(path + name, "r") + if name[0] == "<": + j = string.index(name, "/") + k = string.index(name, ">") + (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)) + else: + size = os.stat(path + name)[stat.ST_SIZE] + file_handle = utils.open_file(path + name) except utils.cant_open_exc: print "ALERT: Couldn't open " + path + name else: - md5 = apt_pkg.md5sum(file_handle) + hash = hashop(file_handle) file_handle.close() + out.write(" %s %8d %s\n" % (hash, size, name)) - size = os.stat(path + name)[stat.ST_SIZE] - out.write(" %s %8d %s\n" % (md5, size, name)) +def print_md5_files (tree, files): + print_md5sha_files (tree, files, apt_pkg.md5sum) def print_sha1_files (tree, files): - path = Cnf["Dir::RootDir"] + tree + "/" - for name in files: - try: - file_handle = utils.open_file(path + name, "r") - except utils.cant_open_exc: - print "ALERT: Couldn't open " + path + name - else: - sha1 = apt_pkg.sha1sum(file_handle) - file_handle.close() - - size = os.stat(path + name)[stat.ST_SIZE] - out.write(" %s %8d %s\n" % (sha1, size, name)) + print_md5sha_files (tree, files, apt_pkg.sha1sum) ################################################################################ @@ -80,23 +114,23 @@ def main (): global Cnf, AptCnf, projectB, out out = sys.stdout; - - apt_pkg.init() - - Cnf = apt_pkg.newConfiguration() - apt_pkg.ReadConfigFileISC(Cnf,utils.which_conf_file()) + Cnf = utils.get_conf() AptCnf = apt_pkg.newConfiguration() apt_pkg.ReadConfigFileISC(AptCnf,utils.which_apt_conf_file()) - print "APT.CONF IS: " + utils.which_apt_conf_file() - Arguments = [('d',"debug","Ziyi::Options::Debug", "IntVal"), - ('h',"help","Ziyi::Options::Help"), - ('v',"version","Ziyi::Options::Version")] + Arguments = [('h',"help","Ziyi::Options::Help")]; + for i in [ "help" ]: + if not Cnf.has_key("Ziyi::Options::%s" % (i)): + Cnf["Ziyi::Options::%s" % (i)] = ""; suites = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv) + Options = Cnf.SubTree("Ziyi::Options") + + if Options["Help"]: + usage(); - if suites == []: + if not suites: suites = Cnf.SubTree("Suite").List() def real_arch(x): @@ -130,7 +164,7 @@ def main (): nonus = 1 if components != []: for c in components: - if c[:7] != "non-US/": + if string.find(c, "non-US/") != 0: nonus = 0 else: nonus = 0 @@ -141,6 +175,14 @@ def main (): tree = SuiteBlock.get("Tree", "dists/%s" % (longsuite)) + if AptCnf.has_key("tree::%s" % (tree)): + pass + elif AptCnf.has_key("bindirectory::%s" % (tree)): + pass + else: + 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") @@ -169,30 +211,6 @@ def main (): for file in compressnames("tree::%s" % (tree), "Sources", "%s/%s/Sources" % (sec, arch)): files.append(file) else: - rel = "%s/binary-%s/Release" % (sec, arch) - relpath = Cnf["Dir::RootDir"]+tree+"/"+rel - if os.path.exists(relpath): - try: - 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("%s/binary-%s/Release" % (sec,arch)) - disks = "%s/disks-%s" % (sec, arch) diskspath = Cnf["Dir::RootDir"]+tree+"/"+disks if os.path.exists(diskspath): @@ -203,6 +221,35 @@ def main (): for file in compressnames("tree::%s" % (tree), "Packages", "%s/binary-%s/Packages" % (sec, arch)): files.append(file) + if arch == "source": + 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) + if AptCnf.has_key("tree::%s/main" % (tree)): sec = string.split(AptCnf["tree::%s/main::Sections" % (tree)])[0] if sec != "debian-installer": @@ -230,8 +277,12 @@ def main (): if Cnf.has_key("Dinstall::SigningKeyring"): dest = Cnf["Dir::RootDir"] + tree + "/Release.gpg" if os.path.exists(dest): - os.unlink(dest) - os.system("gpg --secret-keyring \"%s\" --no-options --batch --no-tty --armour --detach-sign <%s --output=%s" % (Cnf["Dinstall::SigningKeyring"], + os.unlink(dest) + keyring = "--secret-keyring \"%s\"" % Cnf["Dinstall::SigningKeyring"] + if Cnf.has_key("Dinstall::SigningPubKeyring"): + keyring = keyring + " --keyring \"%s\"" % Cnf["Dinstall::SigningPubKeyring"] + + os.system("gpg %s --no-options --batch --no-tty --armour --detach-sign <%s --output=%s" % (keyring, Cnf["Dir::RootDir"] + tree + "/Release", dest)) #######################################################################################