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

diff --git a/dak/generate_index_diffs.py b/dak/generate_index_diffs.py
index de473d65..51f1653d 100755
--- a/dak/generate_index_diffs.py
+++ b/dak/generate_index_diffs.py
@@ -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 dak.lib.utils as utils
 
 ################################################################################
 
@@ -288,7 +288,7 @@ def main():
 
     os.umask(0002)
 
-    Cnf = dak.lib.utils.get_conf()
+    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"),
@@ -314,7 +314,7 @@ def main():
         o.close()
 
     AptCnf = apt_pkg.newConfiguration()
-    apt_pkg.ReadConfigFileISC(AptCnf,dak.lib.utils.which_apt_conf_file())
+    apt_pkg.ReadConfigFileISC(AptCnf,utils.which_apt_conf_file())
 
     if Options.has_key("RootDir"): Cnf["Dir::Root"] = Options["RootDir"]
 
@@ -353,7 +353,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(utils.which_apt_conf_file())
             print "ALERT: suite %s not in %s, nor untouchable!" % (suite, aptcnf_filename)
             continue