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-10-22 13:11:55 -0500
commit1a54f2a549b86be5a976d2a43a7985c1265d916a (patch)
treea6be9a1cf46845cdf691e89f8bf6e509170dbec3 /src/lib/Bcfg2/Server/Admin.py
parenta3998969ec25acf20d5e42a1166e001288ca7b0e (diff)
downloadbcfg2-1a54f2a549b86be5a976d2a43a7985c1265d916a.tar.gz
bcfg2-1a54f2a549b86be5a976d2a43a7985c1265d916a.tar.bz2
bcfg2-1a54f2a549b86be5a976d2a43a7985c1265d916a.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()