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/Client.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/Client.py')
-rw-r--r-- | src/lib/Bcfg2/Server/Admin/Client.py | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/lib/Bcfg2/Server/Admin/Client.py b/src/lib/Bcfg2/Server/Admin/Client.py index 570e993ed..187ccfd71 100644 --- a/src/lib/Bcfg2/Server/Admin/Client.py +++ b/src/lib/Bcfg2/Server/Admin/Client.py @@ -18,19 +18,15 @@ class Client(Bcfg2.Server.Admin.MetadataCore): try: self.metadata.add_client(args[1]) except MetadataConsistencyError: - err = sys.exc_info()[1] - print("Error in adding client: %s" % err) - raise SystemExit(1) + self.errExit("Error in adding client: %s" % sys.exc_info()[1]) elif args[0] in ['delete', 'remove', 'del', 'rm']: try: self.metadata.remove_client(args[1]) except MetadataConsistencyError: - err = sys.exc_info()[1] - print("Error in deleting client: %s" % err) - raise SystemExit(1) + self.errExit("Error in deleting client: %s" % + sys.exc_info()[1]) elif args[0] in ['list', 'ls']: for client in self.metadata.list_clients(): print(client) else: - print("No command specified") - raise SystemExit(1) + self.errExit("No command specified") |