From ea3e80412db673367de2e4c32efb693beea96f4e Mon Sep 17 00:00:00 2001 From: James Troup Date: Tue, 12 Feb 2002 22:13:06 +0000 Subject: [PATCH] remove option handling since we don't use options, remove unused imports. --- alyson | 7 ++----- cindy | 15 ++++++--------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/alyson b/alyson index 007063f1..0440171d 100755 --- a/alyson +++ b/alyson @@ -2,7 +2,7 @@ # Sync the ISC configuartion file and the SQL database # Copyright (C) 2000, 2001 James Troup -# $Id: alyson,v 1.6 2001-11-18 19:57:58 rmurray Exp $ +# $Id: alyson,v 1.7 2002-02-12 22:13:06 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 @@ -42,10 +42,7 @@ def main (): Cnf = utils.get_conf() - Arguments = [('D',"debug","Alyson::Options::Debug", "IntVal"), - ('h',"help","Alyson::Options::Help"), - ('v',"version","Alyson::Options::Version")]; - apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv); + apt_pkg.ParseCommandLine(Cnf,[],sys.argv); projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"])); db_access.init(Cnf, projectB); diff --git a/cindy b/cindy index 9f239339..65ff19e8 100755 --- a/cindy +++ b/cindy @@ -2,7 +2,7 @@ # Output override files for apt-ftparchive and indices/ # Copyright (C) 2000, 2001 James Troup -# $Id: cindy,v 1.6 2001-11-18 19:57:58 rmurray Exp $ +# $Id: cindy,v 1.7 2002-02-12 22:13:06 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 @@ -24,8 +24,8 @@ ################################################################################ -import pg, sys, string -import utils, db_access, natalie +import pg, sys; +import utils, db_access; import apt_pkg; ################################################################################ @@ -38,7 +38,7 @@ override = {} def process(suite, component, type): global override; - + suite_id = db_access.get_suite_id(suite); if suite_id == -1: utils.fubar("Suite '%s' not recognised." % (suite)); @@ -88,7 +88,7 @@ def process(suite, component, type): #projectB.query("DELETE FROM override WHERE package = '%s' AND suite = %s AND component = %s AND type = %s" #% (package, suite_id, component_id, type_id)); projectB.query("COMMIT WORK"); - + ################################################################################ @@ -96,10 +96,7 @@ def main (): global Cnf, projectB, override; Cnf = utils.get_conf() - Arguments = [('D',"debug","Denise::Options::Debug", "IntVal"), - ('h',"help","Denise::Options::Help"), - ('V',"version","Denise::Options::Version")]; - apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv); + apt_pkg.ParseCommandLine(Cnf,[],sys.argv); projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"])); db_access.init(Cnf, projectB); -- 2.39.5