#!/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.12 2001-11-04 22:28:44 troup 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
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 == "":
# 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:
def main ():
global Cnf, projectB;
- apt_pkg.init();
+ Cnf = utils.get_conf()
+
+ for i in ["help", "limit", "no-action", "verbose" ]:
+ if not Cnf.has_key("Catherine::Options::%s" % (i)):
+ Cnf["Catherine::Options::%s" % (i)] = "";
- Cnf = apt_pkg.newConfiguration();
- apt_pkg.ReadConfigFileISC(Cnf,utils.which_conf_file());
Arguments = [('h',"help","Catherine::Options::Help"),
('l',"limit", "Catherine::Options::Limit", "HasArg"),
('n',"no-action","Catherine::Options::No-Action"),
('v',"verbose","Catherine::Options::Verbose")];
- for i in ["help", "limit", "no-action", "verose" ]:
- Cnf["Catherine::Options::%s" % (i)] = "";
apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv);
Options = Cnf.SubTree("Catherine::Options")