non-US multi-sig in Release.gpg and 2.2r5

[dak.git] / tea

diff --git a/tea b/tea
index bf163f18935c589699357c8b1d446bc299b49299..47107a37aa9efe150a5e77ab80e815b10506594a 100755 (executable)
--- a/tea
+++ b/tea
@@ -2,7 +2,7 @@
 
 # Sanity check the database
 # Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
-# $Id: tea,v 1.12 2001-09-27 01:23:41 troup Exp $
+# $Id: tea,v 1.14 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
@@ -68,7 +68,7 @@ def check_files():
         if os.access(filename, os.R_OK) == 0:
             utils.warn("'%s' doesn't exist." % (filename));
 
-    file = utils.open_file(Cnf["Dir::OverrideDir"]+'override.unreferenced','r');
+    file = utils.open_file(Cnf["Dir::OverrideDir"]+'override.unreferenced');
     for filename in file.readlines():
         filename = filename[:-1];
         excluded[filename] = "";
@@ -90,7 +90,7 @@ def check_dscs():
             continue;
         component = string.lower(component);
         list_filename = '%s%s_%s_source.list' % (Cnf["Dir::ListsDir"], suite, component);
-        list_file = utils.open_file(list_filename, 'r');
+        list_file = utils.open_file(list_filename);
         for line in list_file.readlines():
             file = line[:-1];
             try:
@@ -168,7 +168,7 @@ def check_md5sums():
         db_md5sum = i[2];
         db_size = int(i[3]);
         try:
-            file = utils.open_file(filename, 'r');
+            file = utils.open_file(filename);
         except:
             utils.warn("can't open '%s'." % (filename));
             continue;
@@ -186,10 +186,7 @@ def check_md5sums():
 def main ():
     global Cnf, projectB, db_files, waste, excluded;
 
-    apt_pkg.init();
-
-    Cnf = apt_pkg.newConfiguration();
-    apt_pkg.ReadConfigFileISC(Cnf,utils.which_conf_file());
+    Cnf = utils.get_conf()
 
     apt_pkg.ParseCommandLine(Cnf,[],sys.argv);
     projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"]));