From 2d46c64db54170b6f067a3d8a792d7a02ea95f24 Mon Sep 17 00:00:00 2001
From: Alexander Sulfrian <alexander@sulfrian.net>
Date: Tue, 25 Nov 2014 19:16:51 +0100
Subject: Bcfg2/Server/Admin: fix the Help subcommand

At least the Help subcommand does not provide a setup method. So we need to
exclude if from the setup() call.
---
 src/lib/Bcfg2/Server/Admin.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/lib/Bcfg2/Server/Admin.py')

diff --git a/src/lib/Bcfg2/Server/Admin.py b/src/lib/Bcfg2/Server/Admin.py
index ef7741880..c294e6be5 100644
--- a/src/lib/Bcfg2/Server/Admin.py
+++ b/src/lib/Bcfg2/Server/Admin.py
@@ -1198,7 +1198,9 @@ class CLI(Bcfg2.Options.CommandRegistry):
     def run(self):
         """ Run bcfg2-admin """
         try:
-            self.commands[Bcfg2.Options.setup.subcommand].setup()
+            cmd = self.commands[Bcfg2.Options.setup.subcommand]
+            if hasattr(cmd, 'setup'):
+                cmd.setup()
             return self.runcommand()
         finally:
             self.shutdown()
-- 
cgit v1.2.3-1-g7c22