X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=catherine;h=80ff5b7202907963ae0c8c6741e7c34e8a252fbb;hb=d0a891d7eb8d79b747f031392dd29de3acd68d84;hp=6ac76b54a5a4e2471f09c7c29e209c18b87999cc;hpb=c15c9f103968abfec7be98f99f34112ebe6683c1;p=dak.git diff --git a/catherine b/catherine index 6ac76b54..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 -# $Id: catherine,v 1.14 2001-11-19 00:26:22 troup Exp $ +# Copyright (C) 2000, 2001, 2002 James Troup +# $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 @@ -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)] = "";