pdiff files for translations

i believe this should generate pdiff files for translation files now,
which then ends up as (closes: #657902)

alternatively this will just break our archive, lets see in next dinstall...

Signed-off-by: Joerg Jaspert <joerg@debian.org>

diff --git a/dak/generate_index_diffs.py b/dak/generate_index_diffs.py
index 9384c52de045bf814d58bdb6ee03f4fe6de0d0a0..6968c33605585e3b210aed874f22ae0fe84a8467 100755 (executable)
--- 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)
@@ -198,6 +204,7 @@ def sizesha1(f):
 
 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"]
@@ -307,7 +314,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 +357,25 @@ 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
+                        processfile= os.path.join(workpath, entry)
+                        #print "Working: %s" % (processfile)
+                        storename="%s/%s_%s_%s" % (Options["TempDir"], suite, component, entry)
+                        #print "Storefile: %s" % (storename)
+                        genchanges(Options, processfile + ".diff", storename, processfile, maxdiffs)
+        os.chdir(cwd)
+
         for archobj in architectures:
             architecture = archobj.arch_string
 

diff --git a/daklib/regexes.py b/daklib/regexes.py
index edf9566538003edbe08d3347aef53eba434fcf93..8c9a7fae72545e9159973c60a2962c9c08c8b8d3 100755 (executable)
--- a/daklib/regexes.py
+++ b/daklib/regexes.py
@@ -128,3 +128,6 @@ re_match_expired = re.compile(r"^The key used to sign .+ has expired on .+$")
 # in generate-releases
 re_gensubrelease = re.compile (r".*/(binary-[0-9a-z-]+|source)$")
 re_includeinrelease = re.compile (r"(Translation-[a-zA-Z_]+\.(?:bz2|xz)|Contents-[0-9a-z-]+.gz|Index|Packages(.gz|.bz2)?|Sources(.gz|.bz2)?|MD5SUMS|SHA256SUMS|Release)$")
+
+# in generate_index_diffs
+re_includeinpdiff = re.compile(r"(Translation-[a-zA-Z_]+\.(?:bz2|xz))")