Remove all apt.conf usage from dak

[dak.git] / dak / generate_index_diffs.py

diff --git a/dak/generate_index_diffs.py b/dak/generate_index_diffs.py
index 3297c42cfebf23729b524df67f75f0965c7e280b..3391c7bbafae8714e678dc3be6249167e33bdbd8 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)
@@ -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"]
@@ -291,11 +298,11 @@ def main():
                   ('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("Generate-Index-Diffs::Options")
+    suites = apt_pkg.parse_commandline(Cnf,Arguments,sys.argv)
+    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)
@@ -304,17 +311,15 @@ def main():
         format = "%Y-%m-%d-%H%M.%S"
         Options["PatchName"] = time.strftime( format )
 
-    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()
+        suites = Cnf.subtree("Suite").list()
 
     for suitename in suites:
         print "Processing: " + suitename
-        SuiteBlock = Cnf.SubTree("Suite::" + suitename)
+        SuiteBlock = Cnf.subtree("Suite::" + suitename)
 
         suiteobj = get_suite(suitename.lower())
 
@@ -328,11 +333,12 @@ def main():
         architectures = get_suite_architectures(suite, skipall=True)
 
         if SuiteBlock.has_key("Components"):
-            components = SuiteBlock.ValueList("Components")
+            components = SuiteBlock.value_list("Components")
         else:
-            components = []
+            print "ALERT: suite %s does not have components set in dak.conf" % (suite)
+            continue
 
-        suite_suffix = Cnf.Find("Dinstall::SuiteSuffix")
+        suite_suffix = Cnf.find("Dinstall::SuiteSuffix")
         if components and suite_suffix:
             longsuite = suite + "/" + suite_suffix
         else:
@@ -340,23 +346,30 @@ def main():
 
         tree = SuiteBlock.get("Tree", "dists/%s" % (longsuite))
 
-        if AptCnf.has_key("tree::%s" % (tree)):
-            sections = AptCnf["tree::%s::Sections" % (tree)].split()
-        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())
-            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 components:
+            #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
 
-            # use sections instead of components since dak.conf
-            # treats "foo/bar main" as suite "foo", suitesuffix "bar" and
-            # component "bar/main". suck.
-
-            for component in sections:
+            for component in components:
                 if architecture == "source":
                     longarch = architecture
                     packages = "Sources"