X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fgenerate_index_diffs.py;h=992edf9c65314b088d4e6e3675cff22df8f11621;hb=ffa56d7d9f69b1ed636db8ab5726f2508a94e13e;hp=ee602e05b8c0d93883b52b17e22c009d9fbc1205;hpb=30413cf0ff7bc21b8d2b8b4346406357fe55dc19;p=dak.git diff --git a/dak/generate_index_diffs.py b/dak/generate_index_diffs.py index ee602e05..992edf9c 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 @@ -32,7 +32,7 @@ import sys, os, tempfile import apt_pkg -import utils +import daklib.utils ################################################################################ @@ -44,7 +44,7 @@ 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 @@ -193,7 +193,6 @@ def sizesha1(f): def genchanges(Options, outdir, oldfile, origfile, maxdiffs = 14): if Options.has_key("NoAct"): - print "not doing anything" return patchname = Options["PatchName"] @@ -213,15 +212,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,7 +231,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) + print "warning: old file seems to have changed! %s %s => %s %s" % (upd.filesizesha1 + oldsizesha1) # XXX this should be usable now # @@ -256,10 +255,9 @@ 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") pipe_file(oldf, w) @@ -288,17 +286,17 @@ def main(): 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"), + Cnf = daklib.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("Tiffani::Options") + Options = Cnf.SubTree("Generate-Index-Diffs::Options") if Options.has_key("Help"): usage() maxdiffs = Options.get("MaxDiffs::Default", "14") @@ -314,7 +312,7 @@ def main(): o.close() AptCnf = apt_pkg.newConfiguration() - apt_pkg.ReadConfigFileISC(AptCnf,utils.which_apt_conf_file()) + apt_pkg.ReadConfigFileISC(AptCnf,daklib.utils.which_apt_conf_file()) if Options.has_key("RootDir"): Cnf["Dir::Root"] = Options["RootDir"] @@ -322,8 +320,6 @@ def main(): suites = Cnf.SubTree("Suite").List() for suite in suites: - if suite == "Experimental": continue - print "Processing: " + suite SuiteBlock = Cnf.SubTree("Suite::" + suite) @@ -353,7 +349,7 @@ 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()) + aptcnf_filename = os.path.basename(daklib.utils.which_apt_conf_file()) print "ALERT: suite %s not in %s, nor untouchable!" % (suite, aptcnf_filename) continue @@ -366,11 +362,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 +382,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)) ################################################################################