X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=tea;h=bf163f18935c589699357c8b1d446bc299b49299;hb=a092f0aa8e82394e25a16da9e87263ee26b8de0e;hp=091c4f9e748ae849c7d1251eadadae86385e8e14;hpb=1cf8b8269805692718976f9b00f6ae4d7a7b4f85;p=dak.git

diff --git a/tea b/tea
index 091c4f9e..bf163f18 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.6 2001-03-02 02:30:12 troup Exp $
+# $Id: tea,v 1.12 2001-09-27 01:23:41 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
@@ -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:
@@ -54,6 +54,7 @@ def process_dir (arg, dirname, filenames):
 ################################################################################
 
 def check_files():
+    global db_files;
 
     print "Building list of Database files...";
 
@@ -65,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():
@@ -95,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));
 
 ################################################################################
 
@@ -134,20 +135,24 @@ def check_source_in_one_dir():
     for i in q.getresult():
         source_id = i[0];
         q2 = projectB.query("""
-SELECT f.filename FROM files f, dsc_files df WHERE df.source = %s AND f.id = df.file"""
+SELECT l.path, f.filename FROM files f, dsc_files df, location l WHERE df.source = %s AND f.id = df.file AND l.id = f.location"""
                             % (source_id));
         first_path = "";
+        first_filename = "";
         broken = 0;
         for j in q2.getresult():
-            path = os.path.dirname(j[0]);
+            filename = j[0]+j[1];
+            path = os.path.dirname(filename);
             if first_path == "":
                 first_path = path;
+                first_filename = filename;
             elif first_path != path:
-                broken = 1;
-                #print "Woah, we got a live one here... %s" % (source_id);
+                symlink = path + '/' + os.path.basename(first_filename);
+                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:
             broken_count = broken_count + 1;
-            print q2
     print "Found %d source packages where the source is not all in one directory." % (broken_count);
 
 ################################################################################
@@ -156,7 +161,7 @@ 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]);
@@ -165,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."
 
@@ -182,20 +187,16 @@ def main ():
     global Cnf, projectB, db_files, waste, excluded;
 
     apt_pkg.init();
-    
+
     Cnf = apt_pkg.newConfiguration();
     apt_pkg.ReadConfigFileISC(Cnf,utils.which_conf_file());
 
-    Arguments = [('d',"debug","Tea::Options::Debug", "IntVal"),
-                 ('h',"help","Tea::Options::Help"),
-                 ('v',"version","Tea::Options::Version")];
-
-    apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv);
-    projectB = pg.connect('projectb', 'localhost');
+    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_md5sums();
+    check_source_in_one_dir();
     #check_override();
     #check_dscs();
     #check_files();