diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-01-16 13:28:06 -0500 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-01-17 09:25:45 -0500 |
| commit | ebe7542db7217c2fac3d7111e80f94caedfb69e2 (patch) | |
| tree | 964db7ae511795d80b3ae50f3e14bc9f3344756a /src/sbin/bcfg2 | |
| parent | ae58c24f72a8ed72327fbc3f7305bd69ec6a13db (diff) | |
| download | bcfg2-ebe7542db7217c2fac3d7111e80f94caedfb69e2.tar.gz bcfg2-ebe7542db7217c2fac3d7111e80f94caedfb69e2.tar.bz2 bcfg2-ebe7542db7217c2fac3d7111e80f94caedfb69e2.zip | |
added module-level OptionParser to avoid passing it as an argument or global all over
Diffstat (limited to 'src/sbin/bcfg2')
| -rwxr-xr-x | src/sbin/bcfg2 | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/sbin/bcfg2 b/src/sbin/bcfg2 index 444e86a7c..e9beb47cd 100755 --- a/src/sbin/bcfg2 +++ b/src/sbin/bcfg2 @@ -3,8 +3,8 @@ import sys import signal -import Bcfg2.Options from Bcfg2.Client.Client import Client +from Bcfg2.Options import get_option_parser, CLIENT_COMMON_OPTIONS def cb_sigint_handler(signum, frame): @@ -13,8 +13,7 @@ def cb_sigint_handler(signum, frame): def main(): - optinfo = Bcfg2.Options.CLIENT_COMMON_OPTIONS - setup = Bcfg2.Options.OptionParser(optinfo) + setup = get_option_parser(CLIENT_COMMON_OPTIONS) setup.parse(sys.argv[1:]) if setup['args']: @@ -23,7 +22,7 @@ def main(): raise SystemExit(1) signal.signal(signal.SIGINT, cb_sigint_handler) - return Client(setup).run() + return Client().run() if __name__ == '__main__': sys.exit(main()) |