X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fgenerate_index_diffs.py;h=3391c7bbafae8714e678dc3be6249167e33bdbd8;hb=bc9a2e0eec14192fca315cf4562374d9bedf9fe9;hp=3fe86e112d18d01cc8fafe18a0ee9cd049827840;hpb=46ca5f337b777e413b80774e2e19669779988944;p=dak.git diff --git a/dak/generate_index_diffs.py b/dak/generate_index_diffs.py index 3fe86e11..3391c7bb 100755 --- a/dak/generate_index_diffs.py +++ b/dak/generate_index_diffs.py @@ -34,14 +34,18 @@ import sys import os import tempfile -import subprocess import time import apt_pkg +import glob + from daklib import utils +from daklib.dbconn import get_suite, get_suite_architectures +#from daklib.regexes import re_includeinpdiff +import re +re_includeinpdiff = re.compile(r"(Translation-[a-zA-Z_]+\.(?:bz2|xz))") ################################################################################ -projectB = None Cnf = None Logger = None Options = None @@ -55,11 +59,13 @@ Write out ed-style diffs to Packages/Source lists -h, --help show this help and exit -c give the canonical path of the file -p name for the patch (defaults to current time) + -r use a different archive root + -d name for the hardlink farm for status + -m how many diffs to generate -n take no action """ sys.exit(exit_code) - def tryunlink(file): try: os.unlink(file) @@ -81,7 +87,7 @@ def smartlink(f, t): os.system("bzip2 -d < %s.bz2 > %s" % (f, t)) else: print "missing: %s" % (f) - raise IOError, f + raise IOError(f) def smartopen(file): if os.path.isfile(file): @@ -103,7 +109,7 @@ def pipe_file(f, t): t.close() class Updates: - def __init__(self, readpath = None, max = 14): + def __init__(self, readpath = None, max = 56): self.can_path = None self.history = {} self.history_order = [] @@ -196,8 +202,9 @@ def sizesha1(f): sha1sum = apt_pkg.sha1sum(f) return (sha1sum, size) -def genchanges(Options, outdir, oldfile, origfile, maxdiffs = 14): +def genchanges(Options, outdir, oldfile, origfile, maxdiffs = 56): if Options.has_key("NoAct"): + print "Not acting on: od: %s, oldf: %s, origf: %s, md: %s" % (outdir, oldfile, origfile, maxdiffs) return patchname = Options["PatchName"] @@ -225,7 +232,7 @@ def genchanges(Options, outdir, oldfile, origfile, maxdiffs = 14): return if oldstat[1:3] == origstat[1:3]: - print "%s: hardlink unbroken, assuming unchanged" % (origfile) + #print "%s: hardlink unbroken, assuming unchanged" % (origfile) return oldf = smartopen(oldfile) @@ -234,9 +241,9 @@ def genchanges(Options, outdir, oldfile, origfile, maxdiffs = 14): # should probably early exit if either of these checks fail # alternatively (optionally?) could just trim the patch history - if upd.filesizesha1: - if upd.filesizesha1 != oldsizesha1: - print "info: old file " + oldfile + " changed! %s %s => %s %s" % (upd.filesizesha1 + oldsizesha1) + #if upd.filesizesha1: + # if upd.filesizesha1 != oldsizesha1: + # print "info: old file " + oldfile + " changed! %s %s => %s %s" % (upd.filesizesha1 + oldsizesha1) if Options.has_key("CanonicalPath"): upd.can_path=Options["CanonicalPath"] @@ -249,16 +256,13 @@ def genchanges(Options, outdir, oldfile, origfile, maxdiffs = 14): if newsizesha1 == oldsizesha1: os.unlink(newfile) oldf.close() - print "%s: unchanged" % (origfile) + #print "%s: unchanged" % (origfile) else: if not os.path.isdir(outdir): os.mkdir(outdir) - cmd = "diff --ed - %s | gzip -c -9 > %s.gz" % (newfile, difffile) - # Do we need shell=True? - w = subprocess.Popen(cmd, shell=True, stdin=subprocess.PIPE).stdin - - # I bet subprocess can do that better than this, but lets do little steps + w = os.popen("diff --ed - %s | gzip --rsyncable -c -9 > %s.gz" % + (newfile, difffile), "w") pipe_file(oldf, w) oldf.close() @@ -283,7 +287,7 @@ def genchanges(Options, outdir, oldfile, origfile, maxdiffs = 14): def main(): global Cnf, Options, Logger - os.umask(0002) + os.umask(0o002) Cnf = utils.get_conf() Arguments = [ ('h', "help", "Generate-Index-Diffs::Options::Help"), @@ -294,11 +298,11 @@ def main(): ('m', "maxdiffs", "Generate-Index-Diffs::Options::MaxDiffs", "hasArg"), ('n', "n-act", "Generate-Index-Diffs::Options::NoAct"), ] - suites = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv) - Options = Cnf.SubTree("Generate-Index-Diffs::Options") + suites = apt_pkg.parse_commandline(Cnf,Arguments,sys.argv) + Options = Cnf.subtree("Generate-Index-Diffs::Options") if Options.has_key("Help"): usage() - maxdiffs = Options.get("MaxDiffs::Default", "14") + maxdiffs = Options.get("MaxDiffs::Default", "56") maxpackages = Options.get("MaxDiffs::Packages", maxdiffs) maxcontents = Options.get("MaxDiffs::Contents", maxdiffs) maxsources = Options.get("MaxDiffs::Sources", maxdiffs) @@ -307,32 +311,34 @@ def main(): format = "%Y-%m-%d-%H%M.%S" Options["PatchName"] = time.strftime( format ) - AptCnf = apt_pkg.newConfiguration() - apt_pkg.ReadConfigFileISC(AptCnf,utils.which_apt_conf_file()) - - if Options.has_key("RootDir"): Cnf["Dir::Root"] = Options["RootDir"] + if Options.has_key("RootDir"): + Cnf["Dir::Root"] = Options["RootDir"] if not suites: - suites = Cnf.SubTree("Suite").List() + suites = Cnf.subtree("Suite").list() - for suite in suites: - print "Processing: " + suite - SuiteBlock = Cnf.SubTree("Suite::" + suite) + for suitename in suites: + print "Processing: " + suitename + SuiteBlock = Cnf.subtree("Suite::" + suitename) - if SuiteBlock.has_key("Untouchable"): + suiteobj = get_suite(suitename.lower()) + + # Use the canonical version of the suite name + suite = suiteobj.suite_name + + if suiteobj.untouchable: print "Skipping: " + suite + " (untouchable)" continue - suite = suite.lower() - - architectures = SuiteBlock.ValueList("Architectures") + architectures = get_suite_architectures(suite, skipall=True) if SuiteBlock.has_key("Components"): - components = SuiteBlock.ValueList("Components") + components = SuiteBlock.value_list("Components") else: - components = [] + print "ALERT: suite %s does not have components set in dak.conf" % (suite) + continue - suite_suffix = Cnf.Find("Dinstall::SuiteSuffix") + suite_suffix = Cnf.find("Dinstall::SuiteSuffix") if components and suite_suffix: longsuite = suite + "/" + suite_suffix else: @@ -340,32 +346,30 @@ def main(): tree = SuiteBlock.get("Tree", "dists/%s" % (longsuite)) - if AptCnf.has_key("tree::%s" % (tree)): - sections = AptCnf["tree::%s::Sections" % (tree)].split() - elif AptCnf.has_key("bindirectory::%s" % (tree)): - sections = AptCnf["bindirectory::%s::Sections" % (tree)].split() - else: - aptcnf_filename = os.path.basename(utils.which_apt_conf_file()) - print "ALERT: suite %s not in %s, nor untouchable!" % (suite, aptcnf_filename) - continue - - for architecture in architectures: - if architecture == "all": - continue - - if architecture != "source": - # Process Contents - file = "%s/Contents-%s" % (Cnf["Dir::Root"] + tree, - architecture) - storename = "%s/%s_contents_%s" % (Options["TempDir"], suite, architecture) - genchanges(Options, file + ".diff", storename, file, \ - Cnf.get("Suite::%s::Generate-Index-Diffs::MaxDiffs::Contents" % (suite), maxcontents)) - - # use sections instead of components since dak.conf - # treats "foo/bar main" as suite "foo", suitesuffix "bar" and - # component "bar/main". suck. - - for component in sections: + # See if there are Translations which might need a new pdiff + cwd = os.getcwd() + for component in components: + #print "DEBUG: Working on %s" % (component) + workpath=os.path.join(Cnf["Dir::Root"], tree, component, "i18n") + if os.path.isdir(workpath): + os.chdir(workpath) + for dirpath, dirnames, filenames in os.walk(".", followlinks=True, topdown=True): + for entry in filenames: + if not re_includeinpdiff.match(entry): + #print "EXCLUDING %s" % (entry) + continue + (fname, fext) = os.path.splitext(entry) + processfile=os.path.join(workpath, fname) + #print "Working: %s" % (processfile) + storename="%s/%s_%s_%s" % (Options["TempDir"], suite, component, fname) + #print "Storefile: %s" % (storename) + genchanges(Options, processfile + ".diff", storename, processfile, maxdiffs) + os.chdir(cwd) + + for archobj in architectures: + architecture = archobj.arch_string + + for component in components: if architecture == "source": longarch = architecture packages = "Sources" @@ -374,6 +378,12 @@ def main(): longarch = "binary-%s"% (architecture) packages = "Packages" maxsuite = maxpackages + # Process Contents + file = "%s/%s/Contents-%s" % (Cnf["Dir::Root"] + tree, component, + architecture) + storename = "%s/%s_%s_contents_%s" % (Options["TempDir"], suite, component, architecture) + genchanges(Options, file + ".diff", storename, file, \ + Cnf.get("Suite::%s::Generate-Index-Diffs::MaxDiffs::Contents" % (suite), maxcontents)) file = "%s/%s/%s/%s" % (Cnf["Dir::Root"] + tree, component, longarch, packages)