X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fgenerate_index_diffs.py;h=51f1653d50ed7bc4f576a2dfea2c1fd5d1488ff8;hb=7aaaad3135c9164390af5897925660842368660b;hp=db8567783e63364600e3f69d8b239193d3ccf2d6;hpb=59fd5aa2a8be3b76dbc968429c457f096adfa472;p=dak.git

diff --git a/dak/generate_index_diffs.py b/dak/generate_index_diffs.py
index db856778..51f1653d 100755
--- a/dak/generate_index_diffs.py
+++ b/dak/generate_index_diffs.py
@@ -4,10 +4,10 @@
 # generates partial package updates list
 
 # idea and basic implementation by Anthony, some changes by Andreas
-# parts are stolen from ziyi
+# parts are stolen from 'dak generate-releases'
 #
-# Copyright (C) 2004-5  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,19 +32,19 @@
 
 import sys, os, tempfile
 import apt_pkg
-import utils
+import dak.lib.utils as utils
 
 ################################################################################
 
-projectB = None;
-Cnf = None;
-Logger = None;
-Options = None;
+projectB = None
+Cnf = None
+Logger = None
+Options = None
 
 ################################################################################
 
 def usage (exit_code=0):
-    print """Usage: tiffani [OPTIONS] [suites]
+    print """Usage: dak generate-index-diffs [OPTIONS] [suites]
 Write out ed-style diffs to Packages/Source lists
 
   -h, --help            show this help and exit
@@ -52,7 +52,7 @@ Write out ed-style diffs to Packages/Source lists
   -p                    name for the patch (defaults to current time)
   -n                    take no action
     """
-    sys.exit(exit_code);
+    sys.exit(exit_code)
 
 
 def tryunlink(file):
@@ -286,20 +286,20 @@ def genchanges(Options, outdir, oldfile, origfile, maxdiffs = 14):
 def main():
     global Cnf, Options, Logger
 
-    os.umask(0002);
-
-    Cnf = utils.get_conf();
-    Arguments = [ ('h', "help", "Tiffani::Options::Help"),
-                  ('c', None, "Tiffani::Options::CanonicalPath", "hasArg"),
-                  ('p', "patchname", "Tiffani::Options::PatchName", "hasArg"),
-                  ('r', "rootdir", "Tiffani::Options::RootDir", "hasArg"),
-                  ('d', "tmpdir", "Tiffani::Options::TempDir", "hasArg"),
-                  ('m', "maxdiffs", "Tiffani::Options::MaxDiffs", "hasArg"),
-		  ('n', "n-act", "Tiffani::Options::NoAct"),
-                ];
-    suites = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv);
-    Options = Cnf.SubTree("Tiffani::Options");
-    if Options.has_key("Help"): usage();
+    os.umask(0002)
+
+    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"),
+                ]
+    suites = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv)
+    Options = Cnf.SubTree("Generate-Index-Diffs::Options")
+    if Options.has_key("Help"): usage()
 
     maxdiffs = Options.get("MaxDiffs::Default", "14")
     maxpackages = Options.get("MaxDiffs::Packages", maxdiffs)
@@ -340,11 +340,11 @@ def main():
         else:
             components = []
 
-        suite_suffix = Cnf.Find("Dinstall::SuiteSuffix");
+        suite_suffix = Cnf.Find("Dinstall::SuiteSuffix")
         if components and suite_suffix:
-            longsuite = suite + "/" + suite_suffix;
+            longsuite = suite + "/" + suite_suffix
         else:
-            longsuite = suite;
+            longsuite = suite
 
         tree = SuiteBlock.get("Tree", "dists/%s" % (longsuite))
 
@@ -353,8 +353,8 @@ def main():
         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);
+            aptcnf_filename = os.path.basename(utils.which_apt_conf_file())
+            print "ALERT: suite %s not in %s, nor untouchable!" % (suite, aptcnf_filename)
             continue
 
         for architecture in architectures:
@@ -368,9 +368,9 @@ def main():
                 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::Tiffani::MaxDiffs::Contents" % (suite), maxcontents))
+                  Cnf.get("Suite::%s::Generate-Index-Diffs::MaxDiffs::Contents" % (suite), maxcontents))
 
-            # use sections instead of components since katie.conf
+            # use sections instead of components since dak.conf
             # treats "foo/bar main" as suite "foo", suitesuffix "bar" and
             # component "bar/main". suck.
 
@@ -389,7 +389,7 @@ def main():
                 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::Tiffani::MaxDiffs::%s" % (suite, packages), maxsuite))
+                  Cnf.get("Suite::%s::Generate-Index-Diffs::MaxDiffs::%s" % (suite, packages), maxsuite))
 
 ################################################################################