X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fgenerate_index_diffs.py;h=f3f7a4a16bfec70f48db0b62268519c36031c6e1;hb=af486e867c2809515c09ae4f854a95355112010e;hp=db8567783e63364600e3f69d8b239193d3ccf2d6;hpb=59fd5aa2a8be3b76dbc968429c457f096adfa472;p=dak.git diff --git a/dak/generate_index_diffs.py b/dak/generate_index_diffs.py index db856778..f3f7a4a1 100755 --- a/dak/generate_index_diffs.py +++ b/dak/generate_index_diffs.py @@ -4,10 +4,10 @@ # generates partial package updates list # idea and basic implementation by Anthony, some changes by Andreas -# parts are stolen from ziyi +# parts are stolen from 'dak generate-releases' # -# Copyright (C) 2004-5 Anthony Towns -# Copyright (C) 2004-5 Andreas Barth +# Copyright (C) 2004, 2005, 2006 Anthony Towns +# Copyright (C) 2004, 2005 Andreas Barth # 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 @@ -30,21 +30,25 @@ ################################################################################ -import sys, os, tempfile +import sys +import os +import tempfile +import subprocess +import time import apt_pkg -import utils +from daklib import utils ################################################################################ -projectB = None; -Cnf = None; -Logger = None; -Options = None; +projectB = None +Cnf = None +Logger = None +Options = None ################################################################################ def usage (exit_code=0): - print """Usage: tiffani [OPTIONS] [suites] + print """Usage: dak generate-index-diffs [OPTIONS] [suites] Write out ed-style diffs to Packages/Source lists -h, --help show this help and exit @@ -52,7 +56,7 @@ Write out ed-style diffs to Packages/Source lists -p name for the patch (defaults to current time) -n take no action """ - sys.exit(exit_code); + sys.exit(exit_code) def tryunlink(file): @@ -107,51 +111,51 @@ class Updates: self.filesizesha1 = None if readpath: - try: - f = open(readpath + "/Index") - x = f.readline() + try: + f = open(readpath + "/Index") + x = f.readline() - def read_hashs(ind, f, self, x=x): - while 1: - x = f.readline() - if not x or x[0] != " ": break + def read_hashs(ind, f, self, x=x): + while 1: + x = f.readline() + if not x or x[0] != " ": break + l = x.split() + if not self.history.has_key(l[2]): + self.history[l[2]] = [None,None] + self.history_order.append(l[2]) + self.history[l[2]][ind] = (l[0], int(l[1])) + return x + + while x: l = x.split() - if not self.history.has_key(l[2]): - self.history[l[2]] = [None,None] - self.history_order.append(l[2]) - self.history[l[2]][ind] = (l[0], int(l[1])) - return x - while x: - l = x.split() + if len(l) == 0: + x = f.readline() + continue - if len(l) == 0: - x = f.readline() - continue + if l[0] == "SHA1-History:": + x = read_hashs(0,f,self) + continue - if l[0] == "SHA1-History:": - x = read_hashs(0,f,self) - continue + if l[0] == "SHA1-Patches:": + x = read_hashs(1,f,self) + continue - if l[0] == "SHA1-Patches:": - x = read_hashs(1,f,self) - continue + if l[0] == "Canonical-Name:" or l[0]=="Canonical-Path:": + self.can_path = l[1] - if l[0] == "Canonical-Name:" or l[0]=="Canonical-Path:": - self.can_path = l[1] + if l[0] == "SHA1-Current:" and len(l) == 3: + self.filesizesha1 = (l[1], int(l[2])) - if l[0] == "SHA1-Current:" and len(l) == 3: - self.filesizesha1 = (l[1], int(l[2])) - - x = f.readline() + x = f.readline() - except IOError: - 0 + except IOError: + 0 def dump(self, out=sys.stdout): if self.can_path: out.write("Canonical-Path: %s\n" % (self.can_path)) - + if self.filesizesha1: out.write("SHA1-Current: %s %7d\n" % (self.filesizesha1)) @@ -164,7 +168,7 @@ class Updates: tryunlink("%s/%s.gz" % (self.readpath, h)) del hs[h] l = l[cnt-self.max:] - self.history_order = l[:] + self.history_order = l[:] out.write("SHA1-History:\n") for h in l: @@ -192,8 +196,7 @@ def sizesha1(f): return (sha1sum, size) def genchanges(Options, outdir, oldfile, origfile, maxdiffs = 14): - if Options.has_key("NoAct"): - print "not doing anything" + if Options.has_key("NoAct"): return patchname = Options["PatchName"] @@ -213,15 +216,15 @@ def genchanges(Options, outdir, oldfile, origfile, maxdiffs = 14): (oldext, oldstat) = smartstat(oldfile) (origext, origstat) = smartstat(origfile) if not origstat: - print "%s doesn't exist" % (origfile) + print "%s: doesn't exist" % (origfile) return if not oldstat: - print "initial run" + print "%s: initial run" % (origfile) os.link(origfile + origext, oldfile + origext) return if oldstat[1:3] == origstat[1:3]: - print "hardlink unbroken, assuming unchanged" + print "%s: hardlink unbroken, assuming unchanged" % (origfile) return oldf = smartopen(oldfile) @@ -232,18 +235,7 @@ def genchanges(Options, outdir, oldfile, origfile, maxdiffs = 14): if upd.filesizesha1: if upd.filesizesha1 != oldsizesha1: - print "old file seems to have changed! %s %s => %s %s" % (upd.filesizesha1 + oldsizesha1) - - # XXX this should be usable now - # - #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"] @@ -256,12 +248,16 @@ def genchanges(Options, outdir, oldfile, origfile, maxdiffs = 14): if newsizesha1 == oldsizesha1: os.unlink(newfile) oldf.close() - print "file unchanged, not generating diff" + print "%s: unchanged" % (origfile) else: - if not os.path.isdir(outdir): os.mkdir(outdir) - print "generating diff" - w = os.popen("diff --ed - %s | gzip -c -9 > %s.gz" % - (newfile, difffile), "w") + 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=PIPE).stdin + + # I bet subprocess can do that better than this, but lets do little steps pipe_file(oldf, w) oldf.close() @@ -286,20 +282,20 @@ def genchanges(Options, outdir, oldfile, origfile, maxdiffs = 14): def main(): global Cnf, Options, Logger - os.umask(0002); - - Cnf = utils.get_conf(); - Arguments = [ ('h', "help", "Tiffani::Options::Help"), - ('c', None, "Tiffani::Options::CanonicalPath", "hasArg"), - ('p', "patchname", "Tiffani::Options::PatchName", "hasArg"), - ('r', "rootdir", "Tiffani::Options::RootDir", "hasArg"), - ('d', "tmpdir", "Tiffani::Options::TempDir", "hasArg"), - ('m', "maxdiffs", "Tiffani::Options::MaxDiffs", "hasArg"), - ('n', "n-act", "Tiffani::Options::NoAct"), - ]; - suites = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv); - Options = Cnf.SubTree("Tiffani::Options"); - if Options.has_key("Help"): usage(); + os.umask(0002) + + Cnf = utils.get_conf() + Arguments = [ ('h', "help", "Generate-Index-Diffs::Options::Help"), + ('c', None, "Generate-Index-Diffs::Options::CanonicalPath", "hasArg"), + ('p', "patchname", "Generate-Index-Diffs::Options::PatchName", "hasArg"), + ('r', "rootdir", "Generate-Index-Diffs::Options::RootDir", "hasArg"), + ('d', "tmpdir", "Generate-Index-Diffs::Options::TempDir", "hasArg"), + ('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") + if Options.has_key("Help"): usage() maxdiffs = Options.get("MaxDiffs::Default", "14") maxpackages = Options.get("MaxDiffs::Packages", maxdiffs) @@ -308,10 +304,7 @@ def main(): if not Options.has_key("PatchName"): format = "%Y-%m-%d-%H%M.%S" - i,o = os.popen2("date +%s" % (format)) - i.close() - Options["PatchName"] = o.readline()[:-1] - o.close() + Options["PatchName"] = time.strftime( format ) AptCnf = apt_pkg.newConfiguration() apt_pkg.ReadConfigFileISC(AptCnf,utils.which_apt_conf_file()) @@ -322,8 +315,6 @@ def main(): suites = Cnf.SubTree("Suite").List() for suite in suites: - if suite == "Experimental": continue - print "Processing: " + suite SuiteBlock = Cnf.SubTree("Suite::" + suite) @@ -340,11 +331,11 @@ def main(): else: components = [] - suite_suffix = Cnf.Find("Dinstall::SuiteSuffix"); + suite_suffix = Cnf.Find("Dinstall::SuiteSuffix") if components and suite_suffix: - longsuite = suite + "/" + suite_suffix; + longsuite = suite + "/" + suite_suffix else: - longsuite = suite; + longsuite = suite tree = SuiteBlock.get("Tree", "dists/%s" % (longsuite)) @@ -353,8 +344,8 @@ def main(): 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); + 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: @@ -366,11 +357,10 @@ def main(): file = "%s/Contents-%s" % (Cnf["Dir::Root"] + tree, architecture) storename = "%s/%s_contents_%s" % (Options["TempDir"], suite, architecture) - print "running contents for %s %s : " % (suite, architecture), genchanges(Options, file + ".diff", storename, file, \ - Cnf.get("Suite::%s::Tiffani::MaxDiffs::Contents" % (suite), maxcontents)) + Cnf.get("Suite::%s::Generate-Index-Diffs::MaxDiffs::Contents" % (suite), maxcontents)) - # use sections instead of components since katie.conf + # use sections instead of components since dak.conf # treats "foo/bar main" as suite "foo", suitesuffix "bar" and # component "bar/main". suck. @@ -387,9 +377,8 @@ def main(): file = "%s/%s/%s/%s" % (Cnf["Dir::Root"] + tree, component, longarch, packages) storename = "%s/%s_%s_%s" % (Options["TempDir"], suite, component, architecture) - print "running for %s %s %s : " % (suite, component, architecture), genchanges(Options, file + ".diff", storename, file, \ - Cnf.get("Suite::%s::Tiffani::MaxDiffs::%s" % (suite, packages), maxsuite)) + Cnf.get("Suite::%s::Generate-Index-Diffs::MaxDiffs::%s" % (suite, packages), maxsuite)) ################################################################################