diff options
author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-06-27 10:35:47 -0400 |
---|---|---|
committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-06-27 10:42:24 -0400 |
commit | d2be8c33d02eedc6787c6106e9526f916a2234b6 (patch) | |
tree | c000d6584ab3cde327f2e696e9de4567d8245690 /src/sbin | |
parent | 9f85b41f12bdc5f25d64b91a6c0413949c9c730e (diff) | |
download | bcfg2-d2be8c33d02eedc6787c6106e9526f916a2234b6.tar.gz bcfg2-d2be8c33d02eedc6787c6106e9526f916a2234b6.tar.bz2 bcfg2-d2be8c33d02eedc6787c6106e9526f916a2234b6.zip |
Options: migrated client to new parser
Diffstat (limited to 'src/sbin')
-rwxr-xr-x | src/sbin/bcfg2 | 26 |
1 files changed, 4 insertions, 22 deletions
diff --git a/src/sbin/bcfg2 b/src/sbin/bcfg2 index 62f749b80..eca7c3395 100755 --- a/src/sbin/bcfg2 +++ b/src/sbin/bcfg2 @@ -2,27 +2,9 @@ """Bcfg2 Client""" import sys -import signal -from Bcfg2.Client.Client import Client -from Bcfg2.Options import load_option_parser, CLIENT_COMMON_OPTIONS - - -def cb_sigint_handler(signum, frame): - """ Exit upon CTRL-C. """ - raise SystemExit(1) - - -def main(): - setup = load_option_parser(CLIENT_COMMON_OPTIONS) - setup.parse(sys.argv[1:]) - - if setup['args']: - print("Bcfg2 takes no arguments, only options") - print(setup.buildHelpMessage()) - raise SystemExit(1) - - signal.signal(signal.SIGINT, cb_sigint_handler) - return Client().run() +from Bcfg2.Options import get_parser +from Bcfg2.Client import Client if __name__ == '__main__': - sys.exit(main()) + get_parser("Bcfg2 client", components=[Client]).parse() + sys.exit(Client().run()) |