X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fgenerate_index_diffs.py;h=e3699a461515f4f1ba12b111d72833e400493c7b;hb=e2e147e37599884d1a323d39b07e6a174bf79e41;hp=9384c52de045bf814d58bdb6ee03f4fe6de0d0a0;hpb=51964a1cda58d2292b66bc97f594804ed8190d49;p=dak.git diff --git a/dak/generate_index_diffs.py b/dak/generate_index_diffs.py index 9384c52d..e3699a46 100755 --- a/dak/generate_index_diffs.py +++ b/dak/generate_index_diffs.py @@ -36,9 +36,13 @@ import os import tempfile 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))") ################################################################################ @@ -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) @@ -198,6 +204,7 @@ def sizesha1(f): 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"] @@ -307,7 +314,8 @@ def main(): 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() @@ -349,6 +357,26 @@ def main(): print "ALERT: suite %s not in %s, nor untouchable!" % (suite, aptcnf_filename) continue + # See if there are Translations which might need a new pdiff + cwd = os.getcwd() + for component in sections: + #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