diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-01-26 08:29:00 -0500 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-01-26 08:29:00 -0500 |
| commit | 89b2d85439be439b427a575d5b89ed452e1e7248 (patch) | |
| tree | de61b71284b995406fba1231ac90e77e1301d7fa /src/lib/Server/Admin | |
| parent | 48ee74f4af26baf165a7d43ec5923d716fa4522a (diff) | |
| download | bcfg2-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/lib/Server/Admin')
| -rw-r--r-- | src/lib/Server/Admin/Reports.py | 20 | ||||
| -rw-r--r-- | src/lib/Server/Admin/__init__.py | 1 |
2 files changed, 8 insertions, 13 deletions
diff --git a/src/lib/Server/Admin/Reports.py b/src/lib/Server/Admin/Reports.py index 3f25f11af..bdfa5c2d6 100644 --- a/src/lib/Server/Admin/Reports.py +++ b/src/lib/Server/Admin/Reports.py @@ -8,9 +8,6 @@ import pickle import platform import sys import traceback -from Bcfg2.Server.Reports.importscript import load_stats -from Bcfg2.Server.Reports.updatefix import update_database -from Bcfg2.Server.Reports.utils import * from lxml.etree import XML, XMLSyntaxError # Compatibility import @@ -22,16 +19,15 @@ if sys.version_info >= (2, 5): else: from md5 import md5 -# Load django -import django.core.management - +# Prereq issues can be signaled with ImportError, so no try needed # FIXME - settings file uses a hardcoded path for /etc/bcfg2.conf -try: - import Bcfg2.Server.Reports.settings -except Exception: - e = sys.exc_info()[1] - sys.stderr.write("Failed to load configuration settings. %s\n" % e) - raise SystemExit(1) +import Bcfg2.Server.Reports.settings + +# Load django and reports stuff _after_ we know we can load settings +import django.core.management +from Bcfg2.Server.Reports.importscript import load_stats +from Bcfg2.Server.Reports.updatefix import update_database +from Bcfg2.Server.Reports.utils import * project_directory = os.path.dirname(Bcfg2.Server.Reports.settings.__file__) project_name = os.path.basename(project_directory) diff --git a/src/lib/Server/Admin/__init__.py b/src/lib/Server/Admin/__init__.py index 96d9703ba..d71d789e7 100644 --- a/src/lib/Server/Admin/__init__.py +++ b/src/lib/Server/Admin/__init__.py @@ -8,7 +8,6 @@ __all__ = [ 'Group', 'Init', 'Minestruct', - 'Mode', 'Perf', 'Pull', 'Query', |