diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2011-07-21 11:15:43 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2011-07-21 11:15:43 -0400 |
| commit | 494dea763857f784fb789243bda569c5bec0f10a (patch) | |
| tree | e45032a8cdfd4db644ca17bba9c1b66dc99297b1 /src/lib/Server/Admin/Reports.py | |
| parent | 9ecf23244aa27efd2e3e6924a0009ef12bf9fc37 (diff) | |
| download | bcfg2-494dea763857f784fb789243bda569c5bec0f10a.tar.gz bcfg2-494dea763857f784fb789243bda569c5bec0f10a.tar.bz2 bcfg2-494dea763857f784fb789243bda569c5bec0f10a.zip | |
Miscellaneous bcfg2-admin bug fixes:
* Fixed mode argument parsing when a config file is supplied
* Fixed loading help messages when Reports is not configured
* Improved option parsing; used Bcfg2.Options.OptionParser
Diffstat (limited to 'src/lib/Server/Admin/Reports.py')
| -rw-r--r-- | src/lib/Server/Admin/Reports.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/lib/Server/Admin/Reports.py b/src/lib/Server/Admin/Reports.py index c9f3d3f58..b4c3b5fcd 100644 --- a/src/lib/Server/Admin/Reports.py +++ b/src/lib/Server/Admin/Reports.py @@ -28,10 +28,9 @@ import django.core.management # 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) - sys.exit(1) +except Exception, err: + sys.stderr.write("Failed to load configuration settings. %s\n" % err) + raise SystemExit(1) project_directory = os.path.dirname(Bcfg2.Server.Reports.settings.__file__) project_name = os.path.basename(project_directory) |