From 494dea763857f784fb789243bda569c5bec0f10a Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Thu, 21 Jul 2011 11:15:43 -0400 Subject: 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 --- src/lib/Server/Admin/Reports.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/lib/Server/Admin/Reports.py') 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) -- cgit v1.2.3-1-g7c22