X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fgenerate_releases.py;h=3d42c51cc40df89d976068b2dd46390d3931f331;hb=e3d8cb7bce30c76d6133ab04ce9b01804944d5cb;hp=64d1d20cc1d0cd16dd9a4420b04db2067973d63b;hpb=800ce9330b0e32661f1dec044e24704bf3a8dc66;p=dak.git diff --git a/dak/generate_releases.py b/dak/generate_releases.py index 64d1d20c..3d42c51c 100755 --- a/dak/generate_releases.py +++ b/dak/generate_releases.py @@ -1,9 +1,12 @@ #!/usr/bin/env python -# Create all the Release files - -# Copyright (C) 2001, 2002, 2006 Anthony Towns +""" Create all the Release files +@contact: Debian FTPMaster +@Copyright: 2001, 2002, 2006 Anthony Towns +@copyright: 2009, 2011 Joerg Jaspert +@license: GNU General Public License version 2 or later +""" # 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 # the Free Software Foundation; either version 2 of the License, or @@ -22,16 +25,22 @@ ################################################################################ -import sys, os, stat, time, pg -import gzip, bz2 +import sys +import os +import stat +import time +import gzip +import bz2 import apt_pkg + from daklib import utils from daklib.dak_exceptions import * +from daklib.dbconn import * +from daklib.config import Config ################################################################################ Cnf = None -projectB = None out = None AptCnf = None @@ -58,6 +67,24 @@ def add_tiffani (files, path, indexstem): #print "ALERT: there was a tiffani file %s" % (filepath) files.append(index) +def gen_i18n_index (files, tree, sec): + path = Cnf["Dir::Root"] + tree + "/" + i18n_path = "%s/i18n" % (sec) + if os.path.exists("%s/%s" % (path, i18n_path)): + index = "%s/Index" % (i18n_path) + out = open("%s/%s" % (path, index), "w") + out.write("SHA1:\n") + for x in os.listdir("%s/%s" % (path, i18n_path)): + if x.startswith('Translation-'): + f = open("%s/%s/%s" % (path, i18n_path, x), "r") + size = os.fstat(f.fileno())[6] + f.seek(0) + sha1sum = apt_pkg.sha1sum(f) + f.close() + out.write(" %s %7d %s\n" % (sha1sum, size, x)) + out.close() + files.append(index) + def compressnames (tree,type,file): compress = AptCnf.get("%s::%s::Compress" % (tree,type), AptCnf.get("Default::%s::Compress" % (type), ". gzip")) result = [] @@ -81,9 +108,15 @@ def compressnames (tree,type,file): decompressors = { 'zcat' : gzip.GzipFile, 'bzip2' : bz2.BZ2File } -def print_md5sha_files (tree, files, hashop): +hashfuncs = { 'MD5' : apt_pkg.md5sum, + 'SHA1' : apt_pkg.sha1sum, + 'SHA256' : apt_pkg.sha256sum } + +def print_hash_files (tree, files, hashop): path = Cnf["Dir::Root"] + tree + "/" for name in files: + hashvalue = "" + hashlen = 0 try: if name[0] == "<": j = name.index("/") @@ -91,10 +124,13 @@ def print_md5sha_files (tree, files, hashop): (cat, ext, name) = (name[1:j], name[j+1:k], name[k+1:]) file_handle = decompressors[ cat ]( "%s%s%s" % (path, name, ext) ) contents = file_handle.read() + hashvalue = hashfuncs[ hashop ](contents) + hashlen = len(contents) else: try: file_handle = utils.open_file(path + name) - contents = file_handle.read() + hashvalue = hashfuncs[ hashop ](file_handle) + hashlen = os.stat(path + name).st_size except: raise else: @@ -103,26 +139,47 @@ def print_md5sha_files (tree, files, hashop): except CantOpenError: print "ALERT: Couldn't open " + path + name + except IOError: + print "ALERT: IOError when reading %s" % (path + name) + raise else: - hash = hashop(contents) - out.write(" %s %8d %s\n" % (hash, len(contents), name)) - -def print_md5_files (tree, files): - print_md5sha_files (tree, files, apt_pkg.md5sum) - -def print_sha1_files (tree, files): - print_md5sha_files (tree, files, apt_pkg.sha1sum) - -def print_sha256_files (tree, files): - print_md5sha_files (tree, files, apt_pkg.sha256sum) + out.write(" %s %8d %s\n" % (hashvalue, hashlen, name)) + +def write_release_file (relpath, suite, component, origin, label, arch, version="", suite_suffix="", notautomatic="", butautomaticupgrades=""): + try: + if os.access(relpath, os.F_OK): + if os.stat(relpath).st_nlink > 1: + os.unlink(relpath) + release = open(relpath, "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,component)) + else: + release.write("Component: %s\n" % (component)) + + release.write("Origin: %s\n" % (origin)) + release.write("Label: %s\n" % (label)) + if notautomatic != "": + release.write("NotAutomatic: %s\n" % (notautomatic)) + if butautomaticupgrades != "": + release.write("ButAutomaticUpgrades: %s\n" % (butautomaticupgrades)) + release.write("Architecture: %s\n" % (arch)) + release.close() ################################################################################ def main (): - global Cnf, AptCnf, projectB, out + global Cnf, AptCnf, out out = sys.stdout Cnf = utils.get_conf() + cnf = Config() Arguments = [('h',"help","Generate-Releases::Options::Help"), ('a',"apt-conf","Generate-Releases::Options::Apt-Conf", "HasArg"), @@ -144,39 +201,44 @@ def main (): AptCnf = apt_pkg.newConfiguration() apt_pkg.ReadConfigFileISC(AptCnf, Options["Apt-Conf"]) - projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"])) - if not suites: suites = Cnf.SubTree("Suite").List() - for suite in suites: - print "Processing: " + suite - SuiteBlock = Cnf.SubTree("Suite::" + suite) - - if SuiteBlock.has_key("Untouchable") and not Options["Force-Touch"]: - print "Skipping: " + suite + " (untouchable)" + for suitename in suites: + print "Processing: " + suitename + SuiteBlock = Cnf.SubTree("Suite::" + suitename) + suiteobj = get_suite(suitename.lower()) + if not suiteobj: + print "ALERT: Cannot find suite %s!" % (suitename.lower()) continue - suite = suite.lower() + # Use the canonical name + suite = suiteobj.suite_name.lower() - origin = SuiteBlock["Origin"] - label = SuiteBlock.get("Label", origin) - codename = SuiteBlock.get("CodeName", "") + if suiteobj.untouchable and not Options["Force-Touch"]: + print "Skipping: " + suite + " (untouchable)" + continue + origin = suiteobj.origin + label = suiteobj.label or suiteobj.origin + codename = suiteobj.codename or "" version = "" - description = "" + if suiteobj.version and suiteobj.version != '-': + version = suiteobj.version + description = suiteobj.description or "" - q = projectB.query("SELECT version, description FROM suite WHERE suite_name = '%s'" % (suite)) - qs = q.getresult() - if len(qs) == 1: - if qs[0][0] != "-": version = qs[0][0] - if qs[0][1]: description = qs[0][1] + architectures = get_suite_architectures(suite, skipall=True, skipsrc=True) - if SuiteBlock.has_key("NotAutomatic"): + if suiteobj.notautomatic: notautomatic = "yes" else: notautomatic = "" + if suiteobj.butautomaticupgrades: + butautomaticupgrades = "yes" + else: + butautomaticupgrades = "" + if SuiteBlock.has_key("Components"): components = SuiteBlock.ValueList("Components") else: @@ -202,7 +264,7 @@ def main (): print Cnf["Dir::Root"] + tree + "/Release" out = open(Cnf["Dir::Root"] + tree + "/Release", "w") - out.write("Origin: %s\n" % (origin)) + out.write("Origin: %s\n" % (suiteobj.origin)) out.write("Label: %s\n" % (label)) out.write("Suite: %s\n" % (suite)) if version != "": @@ -211,13 +273,15 @@ def main (): 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 SuiteBlock.has_key("ValidTime"): - validtime=float(SuiteBlock["ValidTime"]) + if suiteobj.validtime: + validtime=float(suiteobj.validtime) out.write("Valid-Until: %s\n" % (time.strftime("%a, %d %b %Y %H:%M:%S UTC", time.gmtime(time.time()+validtime)))) if notautomatic != "": out.write("NotAutomatic: %s\n" % (notautomatic)) - out.write("Architectures: %s\n" % (" ".join(filter(utils.real_arch, SuiteBlock.ValueList("Architectures"))))) + if butautomaticupgrades != "": + out.write("ButAutomaticUpgrades: %s\n" % (butautomaticupgrades)) + out.write("Architectures: %s\n" % (" ".join([a.arch_string for a in architectures]))) if components: out.write("Components: %s\n" % (" ".join(components))) @@ -227,24 +291,34 @@ def main (): files = [] if AptCnf.has_key("tree::%s" % (tree)): + if AptCnf.has_key("tree::%s::Contents" % (tree)): + pass + else: + for x in os.listdir("%s/%s" % (Cnf["Dir::Root"], tree)): + if x.startswith('Contents-'): + if x.endswith('.diff'): + files.append("%s/Index" % (x)) + else: + files.append(x) + for sec in AptCnf["tree::%s::Sections" % (tree)].split(): for arch in AptCnf["tree::%s::Architectures" % (tree)].split(): if arch == "source": filepath = "%s/%s/Sources" % (sec, arch) - for file in compressnames("tree::%s" % (tree), "Sources", filepath): - files.append(file) + for cfile in compressnames("tree::%s" % (tree), "Sources", filepath): + files.append(cfile) add_tiffani(files, Cnf["Dir::Root"] + tree, filepath) else: - disks = "%s/disks-%s" % (sec, arch) - 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)): - files.append("%s/%s/md5sum.txt" % (disks, dir)) + installer = "%s/installer-%s" % (sec, arch) + installerpath = Cnf["Dir::Root"]+tree+"/"+installer + if os.path.exists(installerpath): + for directory in os.listdir(installerpath): + if os.path.exists("%s/%s/images/MD5SUMS" % (installerpath, directory)): + files.append("%s/%s/images/MD5SUMS" % (installer, directory)) filepath = "%s/binary-%s/Packages" % (sec, arch) - for file in compressnames("tree::%s" % (tree), "Packages", filepath): - files.append(file) + for cfile in compressnames("tree::%s" % (tree), "Packages", filepath): + files.append(cfile) add_tiffani(files, Cnf["Dir::Root"] + tree, filepath) if arch == "source": @@ -252,30 +326,9 @@ def main (): else: rel = "%s/binary-%s/Release" % (sec, arch) relpath = Cnf["Dir::Root"]+tree+"/"+rel - - try: - if os.access(relpath, os.F_OK): - if os.stat(relpath).st_nlink > 1: - os.unlink(relpath) - release = open(relpath, "w") - #release = open(longsuite.replace("/","_") + "_" + 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() + write_release_file(relpath, suite, sec, origin, label, arch, version, suite_suffix, notautomatic, butautomaticupgrades) files.append(rel) + gen_i18n_index(files, tree, sec) if AptCnf.has_key("tree::%s/main" % (tree)): for dis in ["main", "contrib", "non-free"]: @@ -286,10 +339,14 @@ def main (): for arch in AptCnf["tree::%s/%s::Architectures" % (tree,dis)].split(): if arch != "source": # always true - for file in compressnames("tree::%s/%s" % (tree,dis), + rel = "%s/%s/binary-%s/Release" % (dis, sec, arch) + relpath = Cnf["Dir::Root"]+tree+"/"+rel + write_release_file(relpath, suite, dis, origin, label, arch, version, suite_suffix, notautomatic, butautomaticupgrades) + files.append(rel) + for cfile in compressnames("tree::%s/%s" % (tree,dis), "Packages", "%s/%s/binary-%s/Packages" % (dis, sec, arch)): - files.append(file) + files.append(cfile) elif AptCnf.has_key("tree::%s::FakeDI" % (tree)): usetree = AptCnf["tree::%s::FakeDI" % (tree)] sec = AptCnf["tree::%s/main::Sections" % (usetree)].split()[0] @@ -298,23 +355,21 @@ def main (): 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) + for cfile in compressnames("tree::%s/main" % (usetree), "Packages", "main/%s/binary-%s/Packages" % (sec, arch)): + files.append(cfile) elif AptCnf.has_key("bindirectory::%s" % (tree)): - for file in compressnames("bindirectory::%s" % (tree), "Packages", AptCnf["bindirectory::%s::Packages" % (tree)]): - files.append(file.replace(tree+"/","",1)) - for file in compressnames("bindirectory::%s" % (tree), "Sources", AptCnf["bindirectory::%s::Sources" % (tree)]): - files.append(file.replace(tree+"/","",1)) + for cfile in compressnames("bindirectory::%s" % (tree), "Packages", AptCnf["bindirectory::%s::Packages" % (tree)]): + files.append(cfile.replace(tree+"/","",1)) + for cfile in compressnames("bindirectory::%s" % (tree), "Sources", AptCnf["bindirectory::%s::Sources" % (tree)]): + files.append(cfile.replace(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.write("SHA256:\n") - print_sha256_files(tree, files) + for hashvalue in cnf.SubTree("Generate-Releases").List(): + if suite in [ i.lower() for i in cnf.ValueList("Generate-Releases::%s" % (hashvalue)) ]: + out.write("%s:\n" % (hashvalue)) + print_hash_files(tree, files, hashvalue) out.close() if Cnf.has_key("Dinstall::SigningKeyring"): @@ -323,21 +378,26 @@ def main (): keyring += " --keyring \"%s\"" % Cnf["Dinstall::SigningPubKeyring"] arguments = "--no-options --batch --no-tty --armour" - if Cnf.has_key("Dinstall::SigningKeyIds"): - signkeyids = Cnf["Dinstall::SigningKeyIds"].split() - else: - signkeyids = [""] + signkeyids=cnf.signingkeyids.split() dest = Cnf["Dir::Root"] + tree + "/Release.gpg" if os.path.exists(dest): os.unlink(dest) + inlinedest = Cnf["Dir::Root"] + tree + "/InRelease" + if os.path.exists(inlinedest): + os.unlink(inlinedest) for keyid in signkeyids: - if keyid != "": defkeyid = "--default-key %s" % keyid - else: defkeyid = "" + if keyid != "": + defkeyid = "--default-key %s" % keyid + else: + defkeyid = "" os.system("gpg %s %s %s --detach-sign <%s >>%s" % (keyring, defkeyid, arguments, Cnf["Dir::Root"] + tree + "/Release", dest)) + os.system("gpg %s %s %s --clearsign <%s >>%s" % + (keyring, defkeyid, arguments, + Cnf["Dir::Root"] + tree + "/Release", inlinedest)) #######################################################################################