X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=catherine;h=f7841b1214d36a02980ffcfdc6cfe9964a38652b;hb=2f5e692bfbbb6f8146f50d944f7fcc169a95a0a3;hp=70996a9f37690c703acd4290f9667ce441fcbb44;hpb=5fc7cefdb9b600c729ca5a82fd5b3a828f4fd370;p=dak.git

diff --git a/catherine b/catherine
index 70996a9f..f7841b12 100755
--- a/catherine
+++ b/catherine
@@ -2,7 +2,7 @@
 
 # Poolify (move packages from "legacy" type locations to pool locations)
 # Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
-# $Id: catherine,v 1.11 2001-09-27 01:22:51 troup Exp $
+# $Id: catherine,v 1.13 2001-11-18 19:57:58 rmurray Exp $
 
 # 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
@@ -76,7 +76,7 @@ def poolize (q, limit, verbose, no_action):
         destination_filename = base_filename;
         # Work out the source package name
         if utils.re_isadeb.match(base_filename) != None:
-            control = apt_pkg.ParseSection(apt_inst.debExtractControl(utils.open_file(legacy_filename,"r")))
+            control = apt_pkg.ParseSection(apt_inst.debExtractControl(utils.open_file(legacy_filename)))
             package = control.Find("Package", "");
             source = control.Find("Source", package);
             if string.find(source, "(") != -1:
@@ -100,7 +100,7 @@ def poolize (q, limit, verbose, no_action):
         if component == "":
             q = projectB.query("SELECT DISTINCT(c.name) FROM override o, component c WHERE o.package = '%s' AND o.component = c.id;" % (source));
             ql = q.getresult();
-            if ql == []:
+            if not ql:
                 utils.fubar("No override match for '%s' so I can't work out the component." % (source));
             if len(ql) > 1:
                 utils.fubar("Multiple override matches for '%s' so I can't work out the component." % (source));
@@ -134,17 +134,17 @@ def poolize (q, limit, verbose, no_action):
 def main ():
     global Cnf, projectB;
 
-    apt_pkg.init();
+    Cnf = utils.get_conf()
+
+    for i in ["help", "limit", "no-action", "verose" ]:
+	if not Cnf.has_key("Catherine::Options::%s" % (i)):
+	    Cnf["Catherine::Options::%s" % (i)] = "";
 
-    Cnf = apt_pkg.newConfiguration();
-    apt_pkg.ReadConfigFileISC(Cnf,utils.which_conf_file());
 
     Arguments = [('h',"help","Catherine::Options::Help"),
                  ('l',"limit", "Catherine::Options::Limit", "HasArg"),
                  ('n',"no-action","Catherine::Options::No-Action"),
                  ('v',"verbose","Catherine::Options::Verbose")];
-    for i in ["help", "limit", "no-action", "verose" ]:
-        Cnf["Catherine::Options::%s" % (i)] = "";
 
     apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv);
     Options = Cnf.SubTree("Catherine::Options")