X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=catherine;h=66efca2d60a8283ebc8fb501e2334e8f15daf28e;hb=d18cb779351f1803efc61e27f248b6f33d95756e;hp=25d43de2ea9187a72b56b032b1b4786eec7c22a2;hpb=fd89a228fe5c212db66b02a1550fc1b1b6aa3e98;p=dak.git

diff --git a/catherine b/catherine
index 25d43de2..66efca2d 100755
--- a/catherine
+++ b/catherine
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
 # Poolify (move packages from "legacy" type locations to pool locations)
-# Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
-# $Id: catherine,v 1.15 2001-11-19 02:02:53 troup Exp $
+# Copyright (C) 2000, 2001, 2002, 2003, 2004  James Troup <james@nocrew.org>
+# $Id: catherine,v 1.19 2004-03-11 00:20:51 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
@@ -18,14 +18,16 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
+################################################################################
+
 # "Welcome to where time stands still,
 #  No one leaves and no one will."
 #   - Sanitarium - Metallica / Master of the puppets
 
 ################################################################################
 
-import os, pg, stat, string, sys
-import utils, db_access
+import os, pg, re, stat, sys;
+import utils, db_access;
 import apt_pkg, apt_inst;
 
 ################################################################################
@@ -33,6 +35,8 @@ import apt_pkg, apt_inst;
 Cnf = None;
 projectB = None;
 
+re_isadeb = re.compile (r"(.+?)_(.+?)(_(.+))?\.u?deb$");
+
 ################################################################################
 
 def usage (exit_code=0):
@@ -70,16 +74,16 @@ def poolize (q, limit, verbose, no_action):
         if (poolized_size + size) > limit and limit >= 0:
             utils.warn("Hit %s limit." % (utils.size_type(limit)));
             break;
-        poolized_size = poolized_size + size;
-        poolized_count = poolized_count + 1;
+        poolized_size += size;
+        poolized_count += 1;
         base_filename = os.path.basename(legacy_filename);
         destination_filename = base_filename;
         # Work out the source package name
-        if utils.re_isadeb.match(base_filename) != None:
+        if re_isadeb.match(base_filename):
             control = apt_pkg.ParseSection(apt_inst.debExtractControl(utils.open_file(legacy_filename)))
             package = control.Find("Package", "");
             source = control.Find("Source", package);
-            if string.find(source, "(") != -1:
+            if source.find("(") != -1:
                 m = utils.re_extract_src_version.match(source)
                 source = m.group(1)
             # If it's a binary, we need to also rename the file to include the architecture
@@ -91,7 +95,7 @@ def poolize (q, limit, verbose, no_action):
             destination_filename = "%s_%s_%s.deb" % (package, version, architecture);
         else:
             m = utils.re_issource.match(base_filename)
-            if m != None:
+            if m:
                 source = m.group(1);
             else:
                 utils.fubar("expansion of source filename '%s' failed." % (legacy_filename));
@@ -114,7 +118,7 @@ def poolize (q, limit, verbose, no_action):
         # First move the files to the new location
         pool_location = utils.poolify (source, component);
         pool_filename = pool_location + destination_filename;
-        destination = Cnf["Dir::PoolDir"] + pool_location + destination_filename;
+        destination = Cnf["Dir::Pool"] + pool_location + destination_filename;
         if os.path.exists(destination):
             utils.fubar("'%s' already exists in the pool; serious FUBARity." % (legacy_filename));
         if verbose:
@@ -172,13 +176,13 @@ def main ():
     q = projectB.query("""
 SELECT l.path, f.filename, f.id as files_id, c.name as component
    FROM files f, location l, component c WHERE
-    NOT EXISTS (SELECT * FROM location l WHERE l.type = 'pool' AND f.location = l.id)
+    NOT EXISTS (SELECT 1 FROM location l WHERE l.type = 'pool' AND f.location = l.id)
     AND NOT (f.filename ~ '^potato') AND f.location = l.id AND l.component = c.id
 UNION SELECT l.path, f.filename, f.id as files_id, null as component
    FROM files f, location l WHERE
-    NOT EXISTS (SELECT * FROM location l WHERE l.type = 'pool' AND f.location = l.id)
+    NOT EXISTS (SELECT 1 FROM location l WHERE l.type = 'pool' AND f.location = l.id)
     AND NOT (f.filename ~ '^potato') AND f.location = l.id AND NOT EXISTS
-     (SELECT l.path FROM location l WHERE l.component IS NOT NULL AND f.location = l.id);""");
+     (SELECT 1 FROM location l WHERE l.component IS NOT NULL AND f.location = l.id);""");
 
     poolize(q, limit, Options["Verbose"], Options["No-Action"]);