X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fgenerate_index_diffs.py;h=5cac5ccd11b87efd0f5cffb0d40703d7552d1103;hb=5dd1abb51a109c976351ebd6ecd5018e26ee4dc0;hp=acf6b5f36f153e69372e1fcca9bdc4b75e608df9;hpb=51aaf8ec6285ad388faf7641b39df185b12a3248;p=dak.git diff --git a/dak/generate_index_diffs.py b/dak/generate_index_diffs.py index acf6b5f3..5cac5ccd 100755 --- a/dak/generate_index_diffs.py +++ b/dak/generate_index_diffs.py @@ -1,7 +1,8 @@ #!/usr/bin/env python +""" generates partial package updates list""" + ########################################################### -# generates partial package updates list # idea and basic implementation by Anthony, some changes by Andreas # parts are stolen from 'dak generate-releases' @@ -30,14 +31,17 @@ ################################################################################ -import sys, os, tempfile +import sys +import os +import tempfile +import time import apt_pkg -import bz2, gzip, time + from daklib import utils +from daklib.dbconn import get_suite, get_suite_architectures ################################################################################ -projectB = None Cnf = None Logger = None Options = None @@ -79,29 +83,16 @@ def smartlink(f, t): print "missing: %s" % (f) raise IOError, f -def smartread(filename): - """ - If filename exists, slurp the contents into a string. - if filename.gz or filename.bz2 exists instead, decompress and slurp - It returns a tuple of (filename, filecontents) - """ - actual_filename = None - contents = None - if os.path.isfile(filename): - f = open(filename, "r") - elif os.path.isfile("%s.gz" % filename): - actual_filename = "%s.gz" % filename - f = decompressors['zcat'](actual_filename) - elif os.path.isfile("%s.bz2" % filename): - actual_filename = "%s.bz2" % filename - f = decompressors['bzcat'](actual_filename) +def smartopen(file): + if os.path.isfile(file): + f = open(file, "r") + elif os.path.isfile("%s.gz" % file): + f = create_temp_file(os.popen("zcat %s.gz" % file, "r")) + elif os.path.isfile("%s.bz2" % file): + f = create_temp_file(os.popen("bzcat %s.bz2" % file, "r")) else: f = None - - if f: - contents = f.read() - - return (actual_filename, contents) + return f def pipe_file(f, t): f.seek(0) @@ -187,14 +178,17 @@ class Updates: for h in l: out.write(" %s %7d %s\n" % (hs[h][1][0], hs[h][1][1], h)) -decompressors = { 'zcat' : gzip.GzipFile, - 'bzip2' : bz2.BZ2File } - -def sizesha1_str(s): - """ - given a string, return a tuple containing its (sha1sum, length) - """ - return (apt_pkg.sha1sum(s), len( s ) ) +def create_temp_file(r): + f = tempfile.TemporaryFile() + while 1: + x = r.readline() + if not x: break + f.write(x) + r.close() + del x,r + f.flush() + f.seek(0) + return f def sizesha1(f): size = os.fstat(f.fileno())[6] @@ -234,27 +228,15 @@ def genchanges(Options, outdir, oldfile, origfile, maxdiffs = 14): print "%s: hardlink unbroken, assuming unchanged" % (origfile) return - (oldf,contents) = smartread(oldfile) - oldsizesha1 = sizesha1_str(contents) + oldf = smartopen(oldfile) + oldsizesha1 = sizesha1(oldf) # 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 "warning: old file seems to have changed! %s %s => %s %s" % (upd.filesizesha1 + oldsizesha1) - - # XXX this should be usable now - # stew: whatever this is, it won't be usable now that i removed smartopen - # - #for d in upd.history.keys(): - # df = smartopen("%s/%s" % (outdir,d)) - # act_sha1size = sizesha1(df) - # df.close() - # exp_sha1size = upd.history[d][1] - # if act_sha1size != exp_sha1size: - # print "patch file %s seems to have changed! %s %s => %s %s" % \ - # (d,) + exp_sha1size + act_sha1size + print "info: old file " + oldfile + " changed! %s %s => %s %s" % (upd.filesizesha1 + oldsizesha1) if Options.has_key("CanonicalPath"): upd.can_path=Options["CanonicalPath"] @@ -266,17 +248,20 @@ def genchanges(Options, outdir, oldfile, origfile, maxdiffs = 14): if newsizesha1 == oldsizesha1: os.unlink(newfile) -# oldf.close() + oldf.close() print "%s: unchanged" % (origfile) else: - if not os.path.isdir(outdir): os.mkdir(outdir) - os.popen("diff --ed %s %s | gzip -c -9 > %s.gz" % - (oldf, newfile, difffile)) -# pipe_file(oldf, w) -# oldf.close() + if not os.path.isdir(outdir): + os.mkdir(outdir) - (oldf,contents) = smartread(difffile) - difsizesha1 = sizesha1_str(contents) + w = os.popen("diff --ed - %s | gzip --rsyncable -c -9 > %s.gz" % + (newfile, difffile), "w") + pipe_file(oldf, w) + oldf.close() + + difff = smartopen(difffile) + difsizesha1 = sizesha1(difff) + difff.close() upd.history[patchname] = (oldsizesha1, difsizesha1) upd.history_order.append(patchname) @@ -327,17 +312,20 @@ def main(): if not suites: 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) + + suiteobj = get_suite(suitename.lower()) - if SuiteBlock.has_key("Untouchable"): + # 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") @@ -361,17 +349,8 @@ def main(): 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)) + for archobj in architectures: + architecture = archobj.arch_string # use sections instead of components since dak.conf # treats "foo/bar main" as suite "foo", suitesuffix "bar" and @@ -386,6 +365,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)