X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fgenerate_index_diffs.py;h=e83dfa3d6f6ff5f1699c8062c3ed6b304766bb67;hb=ad3dcd2b9f888eebf534f1a0e132b0d81b845e75;hp=992edf9c65314b088d4e6e3675cff22df8f11621;hpb=ffa56d7d9f69b1ed636db8ab5726f2508a94e13e;p=dak.git diff --git a/dak/generate_index_diffs.py b/dak/generate_index_diffs.py index 992edf9c..e83dfa3d 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,9 +31,15 @@ ################################################################################ -import sys, os, tempfile +import sys +import os +import tempfile +import subprocess +import time import apt_pkg -import daklib.utils +import pg +from daklib import utils +from daklib import database ################################################################################ @@ -107,51 +114,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 +171,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,7 +199,7 @@ def sizesha1(f): return (sha1sum, size) def genchanges(Options, outdir, oldfile, origfile, maxdiffs = 14): - if Options.has_key("NoAct"): + if Options.has_key("NoAct"): return patchname = Options["PatchName"] @@ -231,18 +238,7 @@ def genchanges(Options, outdir, oldfile, origfile, maxdiffs = 14): 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 - # - #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"] @@ -257,9 +253,11 @@ def genchanges(Options, outdir, oldfile, origfile, maxdiffs = 14): oldf.close() print "%s: unchanged" % (origfile) else: - if not os.path.isdir(outdir): os.mkdir(outdir) - w = os.popen("diff --ed - %s | gzip -c -9 > %s.gz" % - (newfile, difffile), "w") + if not os.path.isdir(outdir): + os.mkdir(outdir) + + w = os.popen("diff --ed - %s | gzip -c -9 > %s.gz" % + (newfile, difffile), "w") pipe_file(oldf, w) oldf.close() @@ -282,18 +280,18 @@ def genchanges(Options, outdir, oldfile, origfile, maxdiffs = 14): def main(): - global Cnf, Options, Logger + global Cnf, Options, Logger, projectB os.umask(0002) - Cnf = daklib.utils.get_conf() + 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"), + ('n', "n-act", "Generate-Index-Diffs::Options::NoAct"), ] suites = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv) Options = Cnf.SubTree("Generate-Index-Diffs::Options") @@ -306,16 +304,16 @@ 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,daklib.utils.which_apt_conf_file()) + apt_pkg.ReadConfigFileISC(AptCnf,utils.which_apt_conf_file()) if Options.has_key("RootDir"): Cnf["Dir::Root"] = Options["RootDir"] + projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"])) + database.init(Cnf, projectB) + if not suites: suites = Cnf.SubTree("Suite").List() @@ -323,13 +321,15 @@ def main(): print "Processing: " + suite SuiteBlock = Cnf.SubTree("Suite::" + suite) - if SuiteBlock.has_key("Untouchable"): + if database.get_suite_untouchable(suite): print "Skipping: " + suite + " (untouchable)" continue suite = suite.lower() - architectures = SuiteBlock.ValueList("Architectures") + architectures = database.get_suite_architectures(suite) + if architectures == None: + architectures = [] if SuiteBlock.has_key("Components"): components = SuiteBlock.ValueList("Components") @@ -349,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(daklib.utils.which_apt_conf_file()) + aptcnf_filename = os.path.basename(utils.which_apt_conf_file()) print "ALERT: suite %s not in %s, nor untouchable!" % (suite, aptcnf_filename) continue