X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=tea;h=47107a37aa9efe150a5e77ab80e815b10506594a;hb=4914b5dde7ccfe58b5f88b9852deb0a19b804039;hp=fb5cdeb01570d6f67a77ad60be026009b3e08961;hpb=2de8a16fabbb8edf646ba2acd4722f2e070df5e0;p=dak.git

diff --git a/tea b/tea
index fb5cdeb0..47107a37 100755
--- 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.9 2001-03-21 05:37:57 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
@@ -39,8 +39,8 @@ excluded = {};
 
 def process_dir (arg, dirname, filenames):
     global waste, db_files, excluded;
-    
-    if string.find(dirname, '/disks-') != -1 or string.find(dirname, 'upgrade-') != -1: 
+
+    if string.find(dirname, '/disks-') != -1 or string.find(dirname, 'upgrade-') != -1:
         return;
     # hack; can't handle .changes files
     if string.find(dirname, 'proposed-updates') != -1:
@@ -66,9 +66,9 @@ def check_files():
 	filename = os.path.abspath(i[0] + i[1]);
         db_files[filename] = "";
         if os.access(filename, os.R_OK) == 0:
-            sys.stderr.write("W: '%s' doesn't exist.\n" % (filename));
+            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,17 +90,17 @@ 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:
                 utils.parse_changes(file, 1);
             except utils.invalid_dsc_format_exc, line:
-                sys.stderr.write("E: syntax error in .dsc file '%s', line %s.\n" % (file, line));
+                utils.warn("syntax error in .dsc file '%s', line %s." % (file, line));
                 count = count + 1;
 
     if count:
-        sys.stderr.write("Found %s invalid .dsc files.\n" % (count));
+        utils.warn("Found %s invalid .dsc files." % (count));
 
 ################################################################################
 
@@ -148,9 +148,7 @@ SELECT l.path, f.filename FROM files f, dsc_files df, location l WHERE df.source
                 first_filename = filename;
             elif first_path != path:
                 symlink = path + '/' + os.path.basename(first_filename);
-                if os.path.exists(symlink):
-                    print "Not live, exists... %s[%s] {%s}" % (filename, source_id, symlink);
-                else:
+                if not os.path.exists(symlink):
                     broken = 1;
                     print "WOAH, we got a live one here... %s [%s] {%s}" % (filename, source_id, symlink);
         if broken:
@@ -163,23 +161,23 @@ def check_md5sums():
     print "Getting file information from database...";
     q = projectB.query("SELECT l.path, f.filename, f.md5sum, f.size FROM files f, location l WHERE f.location = l.id")
     ql = q.getresult();
-    
+
     print "Checking file md5sums & sizes...";
     for i in ql:
 	filename = os.path.abspath(i[0] + i[1]);
         db_md5sum = i[2];
         db_size = int(i[3]);
         try:
-            file = utils.open_file(filename, 'r');
+            file = utils.open_file(filename);
         except:
-            sys.stderr.write("E: can't open '%s'.\n" % (filename));
+            utils.warn("can't open '%s'." % (filename));
             continue;
         md5sum = apt_pkg.md5sum(file);
         size = os.stat(filename)[stat.ST_SIZE];
         if md5sum != db_md5sum:
-            sys.stderr.write("E: **WARNING** md5sum mismatch for '%s' ('%s' [current] vs. '%s' [db]).\n" % (filename, md5sum, db_md5sum));
+            utils.warn("**WARNING** md5sum mismatch for '%s' ('%s' [current] vs. '%s' [db])." % (filename, md5sum, db_md5sum));
         if size != db_size:
-            sys.stderr.write("E: **WARNING** size mismatch for '%s' ('%s' [current] vs. '%s' [db]).\n" % (filename, size, db_size));
+            utils.warn("**WARNING** size mismatch for '%s' ('%s' [current] vs. '%s' [db])." % (filename, size, db_size));
 
     print "Done."
 
@@ -188,19 +186,12 @@ 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()
 
-    Arguments = [('d',"debug","Tea::Options::Debug", "IntVal"),
-                 ('h',"help","Tea::Options::Help"),
-                 ('v',"version","Tea::Options::Version")];
-
-    apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv);
+    apt_pkg.ParseCommandLine(Cnf,[],sys.argv);
     projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"]));
     db_access.init(Cnf, projectB);
-    
+
     #check_md5sums();
     check_source_in_one_dir();
     #check_override();