diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-06-03 10:56:26 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-06-03 10:56:26 -0400 |
| commit | 06dae2a73ae03ea72feed4e7d6e56d25cfa24195 (patch) | |
| tree | 7e9464187639d8d32ba13958d22f7cc853e76e4b /src/lib/Bcfg2/Server/Admin/Client.py | |
| parent | dae8f399151052fd2a0ce43ac61a56f399a28252 (diff) | |
| download | bcfg2-06dae2a73ae03ea72feed4e7d6e56d25cfa24195.tar.gz bcfg2-06dae2a73ae03ea72feed4e7d6e56d25cfa24195.tar.bz2 bcfg2-06dae2a73ae03ea72feed4e7d6e56d25cfa24195.zip | |
Revert "bcfg2-admin: set appropriate return values on error"
This reverts commit dae8f399151052fd2a0ce43ac61a56f399a28252.
Splitting this into two commits.
Diffstat (limited to 'src/lib/Bcfg2/Server/Admin/Client.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Admin/Client.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/lib/Bcfg2/Server/Admin/Client.py b/src/lib/Bcfg2/Server/Admin/Client.py index 187ccfd71..570e993ed 100644 --- a/src/lib/Bcfg2/Server/Admin/Client.py +++ b/src/lib/Bcfg2/Server/Admin/Client.py @@ -18,15 +18,19 @@ class Client(Bcfg2.Server.Admin.MetadataCore): try: self.metadata.add_client(args[1]) except MetadataConsistencyError: - self.errExit("Error in adding client: %s" % sys.exc_info()[1]) + err = sys.exc_info()[1] + print("Error in adding client: %s" % err) + raise SystemExit(1) elif args[0] in ['delete', 'remove', 'del', 'rm']: try: self.metadata.remove_client(args[1]) except MetadataConsistencyError: - self.errExit("Error in deleting client: %s" % - sys.exc_info()[1]) + err = sys.exc_info()[1] + print("Error in deleting client: %s" % err) + raise SystemExit(1) elif args[0] in ['list', 'ls']: for client in self.metadata.list_clients(): print(client) else: - self.errExit("No command specified") + print("No command specified") + raise SystemExit(1) |