X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=tea;h=209e63a59020b574879605a6102713fc1fe3eb52;hb=0e9d5d8e31062edf50725735424fd89563ffa5a4;hp=fb5cdeb01570d6f67a77ad60be026009b3e08961;hpb=2de8a16fabbb8edf646ba2acd4722f2e070df5e0;p=dak.git

diff --git a/tea b/tea
index fb5cdeb0..209e63a5 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.11 2001-06-22 22:53:14 troup 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
@@ -66,7 +66,7 @@ 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');
     for filename in file.readlines():
@@ -96,11 +96,11 @@ def check_dscs():
             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:
@@ -172,14 +170,14 @@ def check_md5sums():
         try:
             file = utils.open_file(filename, 'r');
         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."