X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=ziyi;h=81db8cdb1e257b900f648b99d6bb413f9ed86008;hb=b70a92c4d2ed83d2a801213a54718956c68d1655;hp=95eb1fd64532952b0779d63e27f03f7ee5c20265;hpb=f2133a20db5d8e8a2bda5c9635c65275a40578f9;p=dak.git diff --git a/ziyi b/ziyi index 95eb1fd6..81db8cdb 100755 --- a/ziyi +++ b/ziyi @@ -3,7 +3,7 @@ # Create all the Release files # Copyright (C) 2001 Anthony Towns -# $Id: ziyi,v 1.1 2001-03-02 02:25:15 troup Exp $ +# $Id: ziyi,v 1.10 2001-11-18 19:57:58 rmurray 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 @@ -34,6 +34,16 @@ 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 = [] @@ -46,19 +56,33 @@ def compressnames (tree,type,file): result.append(file + ".bz2") return result -def print_file (tree, name): +def print_md5_files (tree, files): path = Cnf["Dir::RootDir"] + tree + "/" - try: - file_handle = utils.open_file(path + name, "r") - except utils.cant_open.exc: - print "ALERT: Couldn't open " + path + name - else: - md5 = apt_pkg.md5sum(file_handle) - file_handle.close() - - size = os.stat(path + name)[stat.ST_SIZE] - - out.write(" %s %8d %s\n" % (md5, size, name)) + for name in files: + try: + 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) + file_handle.close() + + size = os.stat(path + name)[stat.ST_SIZE] + out.write(" %s %8d %s\n" % (md5, size, name)) + +def print_sha1_files (tree, files): + path = Cnf["Dir::RootDir"] + tree + "/" + for name in files: + try: + file_handle = utils.open_file(path + name) + 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)) ################################################################################ @@ -66,23 +90,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 suites == []: + if Options["Help"]: + usage(); + + if not suites: suites = Cnf.SubTree("Suite").List() def real_arch(x): @@ -102,6 +126,12 @@ def main (): label = SuiteBlock.get("Label", origin) version = SuiteBlock.get("Version", "") codename = SuiteBlock.get("CodeName", "") + + if SuiteBlock.has_key("NotAutomatic"): + notautomatic = "yes" + else: + notautomatic = "" + if SuiteBlock.has_key("Components"): components = SuiteBlock.SubTree("Components").List() else: @@ -110,7 +140,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 @@ -132,18 +162,22 @@ def main (): if codename != "": out.write("Codename: %s\n" % (codename)) 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("Components: %s\n" % (string.join(components))) out.write("Description: %s\n" % (SuiteBlock["Description"])) - out.write("MD5Sum:\n") + + 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)]): if arch == "source": for file in compressnames("tree::%s" % (tree), "Sources", "%s/%s/Sources" % (sec, arch)): - print_file(tree,file) + files.append(file) else: rel = "%s/binary-%s/Release" % (sec, arch) relpath = Cnf["Dir::RootDir"]+tree+"/"+rel @@ -163,19 +197,53 @@ def main (): 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() - print_file(tree,"%s/binary-%s/Release" % (sec,arch)) + 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): + for dir in os.listdir(diskspath): + 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)): - print_file(tree,file) + files.append(file) + + if AptCnf.has_key("tree::%s/main" % (tree)): + sec = string.split(AptCnf["tree::%s/main::Sections" % (tree)])[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)]): + 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("bindirectory::%s" % (tree)): for file in compressnames("bindirectory::%s" % (tree), "Packages", AptCnf["bindirectory::%s::Packages" % (tree)]): - print_file(tree,string.replace(file,tree+"/","",1)) + files.append(string.replace(file,tree+"/","",1)) for file in compressnames("bindirectory::%s" % (tree), "Sources", AptCnf["bindirectory::%s::Sources" % (tree)]): - print_file(tree,string.replace(file,tree+"/","",1)) + files.append(string.replace(file,tree+"/","",1)) else: print "ALERT: no tree/bindirectory for %s" % (tree) + out.write("MD5Sum:\n") + print_md5_files(tree, files) + out.write("SHA1:\n") + print_sha1_files(tree, files) + + out.close() + 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"], + Cnf["Dir::RootDir"] + tree + "/Release", dest)) + ####################################################################################### if __name__ == '__main__':