diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-06-03 10:57:00 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-06-03 10:57:00 -0400 |
| commit | 7175d64e3b4c150340bb71363e5a25faac80e21e (patch) | |
| tree | 0cbf0d8c0eea192de5a315f7cca65836ad83bf29 /src/lib/Bcfg2/Server/Admin/Minestruct.py | |
| parent | 4e4b33d9ecc869447e82b45972eb170ce78d75ea (diff) | |
| download | bcfg2-7175d64e3b4c150340bb71363e5a25faac80e21e.tar.gz bcfg2-7175d64e3b4c150340bb71363e5a25faac80e21e.tar.bz2 bcfg2-7175d64e3b4c150340bb71363e5a25faac80e21e.zip | |
bcfg2-admin: set appropriate return values on error
Diffstat (limited to 'src/lib/Bcfg2/Server/Admin/Minestruct.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Admin/Minestruct.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/lib/Bcfg2/Server/Admin/Minestruct.py b/src/lib/Bcfg2/Server/Admin/Minestruct.py index 93e42305c..21a56de23 100644 --- a/src/lib/Bcfg2/Server/Admin/Minestruct.py +++ b/src/lib/Bcfg2/Server/Admin/Minestruct.py @@ -21,8 +21,7 @@ class Minestruct(Bcfg2.Server.Admin.StructureMode): try: (opts, args) = getopt.getopt(args, 'f:g:h') except: - self.log.error(self.__doc__) - raise SystemExit(1) + self.errExit(self.__doc__) client = args[0] output = sys.stdout @@ -33,8 +32,7 @@ class Minestruct(Bcfg2.Server.Admin.StructureMode): try: output = open(optarg, 'w') except IOError: - self.log.error("Failed to open file: %s" % (optarg)) - raise SystemExit(1) + self.errExit("Failed to open file: %s" % (optarg)) elif opt == '-g': groups = optarg.split(':') @@ -44,9 +42,8 @@ class Minestruct(Bcfg2.Server.Admin.StructureMode): for item in source.GetExtra(client): extra.add(item) except: - self.log.error("Failed to find extra entry info for client %s" % - client) - raise SystemExit(1) + self.errExit("Failed to find extra entry info for client %s" % + client) root = lxml.etree.Element("Base") self.log.info("Found %d extra entries" % (len(extra))) add_point = root |