X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=catherine;h=80ff5b7202907963ae0c8c6741e7c34e8a252fbb;hb=8e9a5d533c8458eaca33266208f6c347d66dfeef;hp=f7841b1214d36a02980ffcfdc6cfe9964a38652b;hpb=2f5e692bfbbb6f8146f50d944f7fcc169a95a0a3;p=dak.git

diff --git a/catherine b/catherine
index f7841b12..80ff5b72 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.13 2001-11-18 19:57:58 rmurray Exp $
+# Copyright (C) 2000, 2001, 2002  James Troup <james@nocrew.org>
+# $Id: catherine,v 1.16 2002-05-08 11:13:02 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
@@ -94,7 +94,7 @@ def poolize (q, limit, verbose, no_action):
             if m != None:
                 source = m.group(1);
             else:
-                utils.fubar("expandsion of source filename '%s' failed." % (legacy_filename));
+                utils.fubar("expansion of source filename '%s' failed." % (legacy_filename));
         # Work out the component name
         component = qid["component"];
         if component == "":
@@ -114,7 +114,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:
@@ -136,7 +136,7 @@ def main ():
 
     Cnf = utils.get_conf()
 
-    for i in ["help", "limit", "no-action", "verose" ]:
+    for i in ["help", "limit", "no-action", "verbose" ]:
 	if not Cnf.has_key("Catherine::Options::%s" % (i)):
 	    Cnf["Catherine::Options::%s" % (i)] = "";