summaryrefslogtreecommitdiffstats
path: root/src/sbin
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2012-01-26 08:29:00 -0500
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2012-01-26 08:29:00 -0500
commit89b2d85439be439b427a575d5b89ed452e1e7248 (patch)
treede61b71284b995406fba1231ac90e77e1301d7fa /src/sbin
parent48ee74f4af26baf165a7d43ec5923d716fa4522a (diff)
downloadbcfg2-89b2d85439be439b427a575d5b89ed452e1e7248.tar.gz
bcfg2-89b2d85439be439b427a575d5b89ed452e1e7248.tar.bz2
bcfg2-89b2d85439be439b427a575d5b89ed452e1e7248.zip
suppress error message from bcfg2-admin Reports module if Reports not configured (#1056)
Diffstat (limited to 'src/sbin')
-rwxr-xr-xsrc/sbin/bcfg2-admin5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/sbin/bcfg2-admin b/src/sbin/bcfg2-admin
index 386c8dd47..6a502afde 100755
--- a/src/sbin/bcfg2-admin
+++ b/src/sbin/bcfg2-admin
@@ -6,13 +6,12 @@ import logging
import Bcfg2.Server.Core
import Bcfg2.Logger
import Bcfg2.Options
+import Bcfg2.Server.Admin
# Compatibility import
from Bcfg2.Bcfg2Py3k import StringIO
log = logging.getLogger('bcfg2-admin')
-import Bcfg2.Server.Admin
-
def mode_import(modename):
"""Load Bcfg2.Server.Admin.<mode>."""
modname = modename.capitalize()
@@ -66,7 +65,7 @@ def main():
if setup['args'][0] in get_modes():
modname = setup['args'][0].capitalize()
- if len(setup['args']) > 1 and setup['args'][1] == 'help':
+ if len(setup['args']) > 1 and setup['args'][1] == 'help':
print(mode_import(modname).__longhelp__)
raise SystemExit(0)
try: