X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fgenerate_index_diffs.py;h=cfe85f1797a6a819cda4aa2e6a9840c730d730a3;hb=e57bbc31e628424e7c39f3f89d93c7e5dc79be34;hp=3297c42cfebf23729b524df67f75f0965c7e280b;hpb=1c2f5f4048b36efb345a3aa96b20d60dc7af1990;p=dak.git

diff --git a/dak/generate_index_diffs.py b/dak/generate_index_diffs.py
index 3297c42c..cfe85f17 100755
--- a/dak/generate_index_diffs.py
+++ b/dak/generate_index_diffs.py
@@ -36,9 +36,13 @@ import os
 import tempfile
 import time
 import apt_pkg
+import glob
 
 from daklib import utils
 from daklib.dbconn import get_suite, get_suite_architectures
+#from daklib.regexes import re_includeinpdiff
+import re
+re_includeinpdiff = re.compile(r"(Translation-[a-zA-Z_]+\.(?:bz2|xz))")
 
 ################################################################################
 
@@ -55,11 +59,13 @@ Write out ed-style diffs to Packages/Source lists
   -h, --help            show this help and exit
   -c                    give the canonical path of the file
   -p                    name for the patch (defaults to current time)
+  -r                    use a different archive root
+  -d                    name for the hardlink farm for status
+  -m                    how many diffs to generate
   -n                    take no action
     """
     sys.exit(exit_code)
 
-
 def tryunlink(file):
     try:
         os.unlink(file)
@@ -103,7 +109,7 @@ def pipe_file(f, t):
     t.close()
 
 class Updates:
-    def __init__(self, readpath = None, max = 14):
+    def __init__(self, readpath = None, max = 56):
         self.can_path = None
         self.history = {}
         self.history_order = []
@@ -196,8 +202,9 @@ def sizesha1(f):
     sha1sum = apt_pkg.sha1sum(f)
     return (sha1sum, size)
 
-def genchanges(Options, outdir, oldfile, origfile, maxdiffs = 14):
+def genchanges(Options, outdir, oldfile, origfile, maxdiffs = 56):
     if Options.has_key("NoAct"):
+        print "Not acting on: od: %s, oldf: %s, origf: %s, md: %s" % (outdir, oldfile, origfile, maxdiffs)
         return
 
     patchname = Options["PatchName"]
@@ -225,7 +232,7 @@ def genchanges(Options, outdir, oldfile, origfile, maxdiffs = 14):
         return
 
     if oldstat[1:3] == origstat[1:3]:
-        #print "%s: hardlink unbroken, assuming unchanged" % (origfile)
+        print "%s: hardlink unbroken, assuming unchanged" % (origfile)
         return
 
     oldf = smartopen(oldfile)
@@ -249,13 +256,14 @@ def genchanges(Options, outdir, oldfile, origfile, maxdiffs = 14):
     if newsizesha1 == oldsizesha1:
         os.unlink(newfile)
         oldf.close()
-        #print "%s: unchanged" % (origfile)
+        print "%s: unchanged" % (origfile)
     else:
         if not os.path.isdir(outdir):
             os.mkdir(outdir)
 
         w = os.popen("diff --ed - %s | gzip --rsyncable -c -9 > %s.gz" %
                      (newfile, difffile), "w")
+        print "pipe, o: %s, w: %s" % (oldf, w)
         pipe_file(oldf, w)
         oldf.close()
 
@@ -295,7 +303,7 @@ def main():
     Options = Cnf.SubTree("Generate-Index-Diffs::Options")
     if Options.has_key("Help"): usage()
 
-    maxdiffs = Options.get("MaxDiffs::Default", "14")
+    maxdiffs = Options.get("MaxDiffs::Default", "56")
     maxpackages = Options.get("MaxDiffs::Packages", maxdiffs)
     maxcontents = Options.get("MaxDiffs::Contents", maxdiffs)
     maxsources = Options.get("MaxDiffs::Sources", maxdiffs)
@@ -307,7 +315,8 @@ def main():
     AptCnf = apt_pkg.newConfiguration()
     apt_pkg.ReadConfigFileISC(AptCnf,utils.which_apt_conf_file())
 
-    if Options.has_key("RootDir"): Cnf["Dir::Root"] = Options["RootDir"]
+    if Options.has_key("RootDir"):
+        Cnf["Dir::Root"] = Options["RootDir"]
 
     if not suites:
         suites = Cnf.SubTree("Suite").List()
@@ -349,6 +358,26 @@ def main():
             print "ALERT: suite %s not in %s, nor untouchable!" % (suite, aptcnf_filename)
             continue
 
+        # See if there are Translations which might need a new pdiff
+        cwd = os.getcwd()
+        for component in sections:
+            #print "DEBUG: Working on %s" % (component)
+            workpath=os.path.join(Cnf["Dir::Root"], tree, component, "i18n")
+            if os.path.isdir(workpath):
+                os.chdir(workpath)
+                for dirpath, dirnames, filenames in os.walk(".", followlinks=True, topdown=True):
+                    for entry in filenames:
+                        if not re_includeinpdiff.match(entry):
+                            #print "EXCLUDING %s" % (entry)
+                            continue
+                        (fname, fext) = os.path.splitext(entry)
+                        processfile=os.path.join(workpath, fname)
+                        #print "Working: %s" % (processfile)
+                        storename="%s/%s_%s_%s" % (Options["TempDir"], suite, component, fname)
+                        #print "Storefile: %s" % (storename)
+                        genchanges(Options, processfile + ".diff", storename, processfile, maxdiffs)
+        os.chdir(cwd)
+
         for archobj in architectures:
             architecture = archobj.arch_string