summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Server/Admin.py
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2014-10-22 08:07:28 -0500
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2014-11-10 17:35:43 -0600
commit987023ba91d38a58c2fd4269bdfd0bf40648b7de (patch)
tree5538feb262f6bfa6d3d1f9052226c0a386843cdb /src/lib/Bcfg2/Server/Admin.py
parentdc9e04ecd8e7cedb4c1645044828442f264c8c9d (diff)
downloadbcfg2-987023ba91d38a58c2fd4269bdfd0bf40648b7de.tar.gz
bcfg2-987023ba91d38a58c2fd4269bdfd0bf40648b7de.tar.bz2
bcfg2-987023ba91d38a58c2fd4269bdfd0bf40648b7de.zip
call shutdown on subcommand registries
Diffstat (limited to 'src/lib/Bcfg2/Server/Admin.py')
-rw-r--r--src/lib/Bcfg2/Server/Admin.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/lib/Bcfg2/Server/Admin.py b/src/lib/Bcfg2/Server/Admin.py
index b6dded175..ef7741880 100644
--- a/src/lib/Bcfg2/Server/Admin.py
+++ b/src/lib/Bcfg2/Server/Admin.py
@@ -1197,5 +1197,8 @@ class CLI(Bcfg2.Options.CommandRegistry):
def run(self):
""" Run bcfg2-admin """
- self.commands[Bcfg2.Options.setup.subcommand].setup()
- return self.runcommand()
+ try:
+ self.commands[Bcfg2.Options.setup.subcommand].setup()
+ return self.runcommand()
+ finally:
+ self.shutdown()