]> git.decadent.org.uk Git - dak.git/blobdiff - dak/generate_index_diffs.py
merge ftpmaster branch
[dak.git] / dak / generate_index_diffs.py
old mode 100755 (executable)
new mode 100644 (file)
index de473d6..03d5165
@@ -6,8 +6,8 @@
 # idea and basic implementation by Anthony, some changes by Andreas
 # parts are stolen from 'dak generate-releases'
 #
-# Copyright (C) 2004-6, 6  Anthony Towns <aj@azure.humbug.org.au>
-# Copyright (C) 2004-5  Andreas Barth <aba@not.so.argh.org>
+# Copyright (C) 2004, 2005, 2006  Anthony Towns <aj@azure.humbug.org.au>
+# Copyright (C) 2004, 2005  Andreas Barth <aba@not.so.argh.org>
 
 # 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 dak.lib.utils
+import daklib.utils
 
 ################################################################################
 
@@ -107,51 +107,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 +164,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 +192,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 +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,11 +255,10 @@ 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" % 
+        w = os.popen("diff --ed - %s | gzip -c -9 > %s.gz" %
                          (newfile, difffile), "w")
         pipe_file(oldf, w)
         oldf.close()
@@ -288,14 +286,14 @@ def main():
 
     os.umask(0002)
 
-    Cnf = dak.lib.utils.get_conf()
+    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"),
+                  ('n', "n-act", "Generate-Index-Diffs::Options::NoAct"),
                 ]
     suites = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv)
     Options = Cnf.SubTree("Generate-Index-Diffs::Options")
@@ -314,7 +312,7 @@ def main():
         o.close()
 
     AptCnf = apt_pkg.newConfiguration()
-    apt_pkg.ReadConfigFileISC(AptCnf,dak.lib.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(dak.lib.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,7 +362,6 @@ 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::Generate-Index-Diffs::MaxDiffs::Contents" % (suite), maxcontents))
 
@@ -387,7 +382,6 @@ 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::Generate-Index-Diffs::MaxDiffs::%s" % (suite, packages), maxsuite))