diff options
| author | Alexander Sulfrian <alexander@sulfrian.net> | 2014-11-25 19:16:51 +0100 |
|---|---|---|
| committer | Alexander Sulfrian <alexander@sulfrian.net> | 2014-11-25 19:16:51 +0100 |
| commit | 2d46c64db54170b6f067a3d8a792d7a02ea95f24 (patch) | |
| tree | c9918729bc13bac0340e4f0ed557eb07a104a014 | |
| parent | ea5e6b609ab72a7665ef18615b572e0fd99973c5 (diff) | |
| download | bcfg2-2d46c64db54170b6f067a3d8a792d7a02ea95f24.tar.gz bcfg2-2d46c64db54170b6f067a3d8a792d7a02ea95f24.tar.bz2 bcfg2-2d46c64db54170b6f067a3d8a792d7a02ea95f24.zip | |
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.
| -rw-r--r-- | src/lib/Bcfg2/Server/Admin.py | 4 |
1 files changed, 3 insertions, 1 deletions
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() |