X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fgenerate_releases.py;h=15ad1244163c511632ff283144026318171b95d3;hb=5d965c34b35048f8a8fab0a7a11f2943d833952d;hp=d6aeb390b1c3f1d0d100a4c422d386288e99317f;hpb=3f89ef3c60a6c0cebd6c6a2793dede201c1e355f;p=dak.git diff --git a/dak/generate_releases.py b/dak/generate_releases.py index d6aeb390..15ad1244 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 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,17 +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 import database from daklib.dak_exceptions import * +from daklib.dbconn import * +from daklib.config import Config ################################################################################ Cnf = None -projectB = None out = None AptCnf = None @@ -59,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 = [] @@ -149,10 +175,11 @@ def write_release_file (relpath, suite, component, origin, label, arch, version= ################################################################################ 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"), @@ -174,40 +201,35 @@ 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"])) - database.init(Cnf, projectB) - if not suites: suites = Cnf.SubTree("Suite").List() - for suite in suites: - print "Processing: " + suite - SuiteBlock = Cnf.SubTree("Suite::" + suite) - - if database.get_suite_untouchable(suite) 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) - architectures = database.get_suite_architectures(suite) - if architectures == None: - architectures = [] - - if SuiteBlock.has_key("NotAutomatic"): + if suiteobj.notautomatic: notautomatic = "yes" else: notautomatic = "" @@ -237,7 +259,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 != "": @@ -246,13 +268,13 @@ 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, architectures)))) + out.write("Architectures: %s\n" % (" ".join([a.arch_string for a in architectures]))) if components: out.write("Components: %s\n" % (" ".join(components))) @@ -267,7 +289,10 @@ def main (): else: for x in os.listdir("%s/%s" % (Cnf["Dir::Root"], tree)): if x.startswith('Contents-'): - files.append(x) + 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(): @@ -296,6 +321,7 @@ def main (): relpath = Cnf["Dir::Root"]+tree+"/"+rel write_release_file(relpath, suite, sec, origin, label, arch, version, suite_suffix, notautomatic) files.append(rel) + gen_i18n_index(files, tree, sec) if AptCnf.has_key("tree::%s/main" % (tree)): for dis in ["main", "contrib", "non-free"]: @@ -347,21 +373,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)) #######################################################################################