From 52824a1cf8786c318269f71f0cc7c234d4a92f73 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Thu, 28 Mar 2013 10:22:53 -0400 Subject: bcfg2_local.py: remove duplicate -Q options --- tools/bcfg2_local.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'tools/bcfg2_local.py') diff --git a/tools/bcfg2_local.py b/tools/bcfg2_local.py index 2b9d39342..70e8fc0b2 100755 --- a/tools/bcfg2_local.py +++ b/tools/bcfg2_local.py @@ -64,6 +64,11 @@ class LocalClient(Client): def main(): optinfo = Bcfg2.Options.CLIENT_COMMON_OPTIONS optinfo.update(Bcfg2.Options.SERVER_COMMON_OPTIONS) + if 'bundle_quick' in optinfo: + # CLIENT_BUNDLEQUICK option uses -Q, just like the server repo + # option. the server repo is more important for this + # application. + del optinfo['bundle_quick'] setup = Bcfg2.Options.OptionParser(optinfo) setup.parse(sys.argv[1:]) -- cgit v1.2.3-1-g7c22 From e59ffe8f211e7bf2314402b96b44e0e72021c15f Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Tue, 2 Apr 2013 14:19:09 -0400 Subject: fix bogus bundle_quick option handling in bcfg2_local.py --- tools/bcfg2_local.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tools/bcfg2_local.py') diff --git a/tools/bcfg2_local.py b/tools/bcfg2_local.py index 70e8fc0b2..edb5a7101 100755 --- a/tools/bcfg2_local.py +++ b/tools/bcfg2_local.py @@ -68,7 +68,8 @@ def main(): # CLIENT_BUNDLEQUICK option uses -Q, just like the server repo # option. the server repo is more important for this # application. - del optinfo['bundle_quick'] + optinfo['bundle_quick'] = Bcfg2.Options.Option('bundlequick', + default=False) setup = Bcfg2.Options.OptionParser(optinfo) setup.parse(sys.argv[1:]) -- cgit v1.2.3-1-g7c22