X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=ziyi;h=343fdb36cf99ae7739af5f54af6c7e423e3d66dd;hb=fc7a1d5b8a3c0521b9873f964a3429797e5bd20a;hp=e056f5039278d3571cd156d9afcd70957d38ef1b;hpb=e6b39a72b11f558cd0021024ef9dcbdc2fa7bd1e;p=dak.git diff --git a/ziyi b/ziyi index e056f503..343fdb36 100755 --- a/ziyi +++ b/ziyi @@ -3,7 +3,7 @@ # Create all the Release files # Copyright (C) 2001 Anthony Towns -# $Id: ziyi,v 1.5 2001-04-24 05:16:22 ajt Exp $ +# $Id: ziyi,v 1.14 2001-11-27 04:18:18 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 = [] @@ -50,7 +60,7 @@ def print_md5_files (tree, files): path = Cnf["Dir::RootDir"] + tree + "/" for name in files: try: - file_handle = utils.open_file(path + name, "r") + file_handle = utils.open_file(path + name) except utils.cant_open_exc: print "ALERT: Couldn't open " + path + name else: @@ -64,7 +74,7 @@ def print_sha1_files (tree, files): path = Cnf["Dir::RootDir"] + tree + "/" for name in files: try: - file_handle = utils.open_file(path + name, "r") + file_handle = utils.open_file(path + name) except utils.cant_open_exc: print "ALERT: Couldn't open " + path + name else: @@ -80,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): @@ -116,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: @@ -124,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 @@ -135,6 +151,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") @@ -146,6 +170,8 @@ 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))) @@ -161,28 +187,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)) - 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): @@ -193,6 +197,34 @@ 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: + 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": @@ -220,8 +252,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)) #######################################################################################