From cd14868d4db8eaa7e9421e1d5fe8653294ac1e38 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Thu, 27 Jun 2013 10:36:17 -0400 Subject: Options: migrated tools to new parser --- tools/upgrade/1.4/migrate_decisions.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'tools/upgrade/1.4/migrate_decisions.py') diff --git a/tools/upgrade/1.4/migrate_decisions.py b/tools/upgrade/1.4/migrate_decisions.py index f7072783a..d0915f202 100755 --- a/tools/upgrade/1.4/migrate_decisions.py +++ b/tools/upgrade/1.4/migrate_decisions.py @@ -6,7 +6,6 @@ import sys import glob import lxml.etree import Bcfg2.Options -from Bcfg2.Server import XMLParser SPECIFIC = re.compile(r'.*\/(white|black)list' @@ -56,12 +55,13 @@ def convert(files, xdata): def main(): - opts = dict(repo=Bcfg2.Options.SERVER_REPOSITORY, - configfile=Bcfg2.Options.CFILE) - setup = Bcfg2.Options.load_option_parser(opts) - setup.parse(sys.argv[1:]) + parser = Bcfg2.Options.get_parser( + description="Migrate from Bcfg2 1.3 Decisions list format to 1.4 " + "format") + parser.add_options([Bcfg2.Options.Common.repository]) + parser.parse() - datadir = os.path.join(setup['repo'], 'Decisions') + datadir = os.path.join(Bcfg2.Options.setup.repository, 'Decisions') whitelist = lxml.etree.Element("Decisions") blacklist = lxml.etree.Element("Decisions") if os.path.exists(datadir): -- cgit v1.2.3-1-g7c22