X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=tea;h=6ef3588357948b21360de3686682da095c1d2052;hb=5fa4d7d8e679f5e77d58d0378861c8050aae4864;hp=21b6c43f119d6ced51109325d300dd018e11238e;hpb=dbf02f5cf9161e49abd8b9315e079d927a903a28;p=dak.git

diff --git a/tea b/tea
index 21b6c43f..6ef35883 100755
--- a/tea
+++ b/tea
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
 # Various different sanity checks
-# Copyright (C) 2000, 2001, 2002, 2003  James Troup <james@nocrew.org>
-# $Id: tea,v 1.26 2003-10-17 11:20:47 troup Exp $
+# Copyright (C) 2000, 2001, 2002, 2003, 2004  James Troup <james@nocrew.org>
+# $Id: tea,v 1.29 2004-09-01 07:52:15 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
@@ -27,7 +27,7 @@
 
 ################################################################################
 
-import commands, os, pg, stat, string, sys, tempfile, time;
+import commands, os, pg, stat, string, sys, time;
 import db_access, utils;
 import apt_pkg, apt_inst;
 
@@ -98,14 +98,16 @@ def check_files():
         if os.access(filename, os.R_OK) == 0:
             utils.warn("'%s' doesn't exist." % (filename));
 
-    file = utils.open_file(Cnf["Dir::Override"]+'override.unreferenced');
-    for filename in file.readlines():
-        filename = filename[:-1];
-        excluded[filename] = "";
+    filename = Cnf["Dir::Override"]+'override.unreferenced';
+    if os.path.exists(filename):
+        file = utils.open_file(filename);
+        for filename in file.readlines():
+            filename = filename[:-1];
+            excluded[filename] = "";
 
     print "Checking against existent files...";
 
-    os.path.walk(Cnf["Dir::Root"]+'dists/', process_dir, None);
+    os.path.walk(Cnf["Dir::Root"]+'pool/', process_dir, None);
 
     print
     print "%s wasted..." % (utils.size_type(waste));
@@ -284,9 +286,7 @@ def validate_sources(suite, component):
     filename = "%s/dists/%s/%s/source/Sources.gz" % (Cnf["Dir::Root"], suite, component);
     print "Processing %s..." % (filename);
     # apt_pkg.ParseTagFile needs a real file handle and can't handle a GzipFile instance...
-    temp_filename = tempfile.mktemp();
-    fd = os.open(temp_filename, os.O_RDWR|os.O_CREAT|os.O_EXCL, 0700);
-    os.close(fd);
+    temp_filename = utils.temp_filename();
     (result, output) = commands.getstatusoutput("gunzip -c %s > %s" % (filename, temp_filename));
     if (result != 0):
         sys.stderr.write("Gunzip invocation failed!\n%s\n" % (output));
@@ -298,8 +298,7 @@ def validate_sources(suite, component):
         directory = Sources.Section.Find('Directory');
         files = Sources.Section.Find('Files');
         for i in files.split('\n'):
-            s = i.split();
-            (md5, size, name) = s;
+            (md5, size, name) = i.split();
             filename = "%s/%s/%s" % (Cnf["Dir::Root"], directory, name);
             if not os.path.exists(filename):
                 if directory.find("potato") == -1:
@@ -316,6 +315,7 @@ def validate_sources(suite, component):
                         src = utils.clean_symlink(pool_filename, filename, Cnf["Dir::Root"]);
                         print "Symlinking: %s -> %s" % (filename, src);
                         #os.symlink(src, filename);
+    sources.close();
     os.unlink(temp_filename);
 
 ########################################
@@ -364,7 +364,7 @@ def check_files_not_symlinks():
 #      q = projectB.query("BEGIN WORK");
     for i in q_files:
 	filename = os.path.normpath(i[0] + i[1]);
-        file_id = i[2];
+#        file_id = i[2];
         if os.access(filename, os.R_OK) == 0:
             utils.warn("%s: doesn't exist." % (filename));
         else: