diff options
author | Robert Gogolok <gogo@cs.uni-sb.de> | 2007-12-30 19:53:25 +0000 |
---|---|---|
committer | Robert Gogolok <gogo@cs.uni-sb.de> | 2007-12-30 19:53:25 +0000 |
commit | 06eeffe8e6344ac62b74cae38d2733b4b64900f1 (patch) | |
tree | 1ecdb4839a089176ffe84864945b9d925da6fd98 /src/sbin | |
parent | d57ec8b80f66b1618e0a1b51885a29036effa6e9 (diff) | |
download | bcfg2-06eeffe8e6344ac62b74cae38d2733b4b64900f1.tar.gz bcfg2-06eeffe8e6344ac62b74cae38d2733b4b64900f1.tar.bz2 bcfg2-06eeffe8e6344ac62b74cae38d2733b4b64900f1.zip |
bcfg2-admin: use Bcfg2.Settings
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@4133 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/sbin')
-rwxr-xr-x | src/sbin/bcfg2-admin | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/sbin/bcfg2-admin b/src/sbin/bcfg2-admin index fb9a58c7d..152edc62d 100755 --- a/src/sbin/bcfg2-admin +++ b/src/sbin/bcfg2-admin @@ -3,6 +3,7 @@ import getopt, difflib, logging, lxml.etree, os, popen2, re, socket, sys, ConfigParser import Bcfg2.Server.Core, Bcfg2.Logging +from Bcfg2.Settings import settings log = logging.getLogger('bcfg-admin') @@ -36,6 +37,9 @@ if __name__ == '__main__': if opt in ("-C", "--configfile"): configfile = arg + # override default settings + settings.read_config_file(configfile) + modes = [x.lower() for x in Bcfg2.Server.Admin.__all__] modes.remove('mode') @@ -52,7 +56,8 @@ if __name__ == '__main__': mode_cls = mode_import(modname) except ImportError, e: log.error("Failed to load admin mod %s: %s" % (modname, e)) - mode = mode_cls(configfile) + raise SystemExit(0) + mode = mode_cls() mode(args[1:]) else: print "unknown mode %s" % args[0] |