From 721c80c052afc40cb4dac5fb2ee52435129e2c6f Mon Sep 17 00:00:00 2001 From: Narayan Desai Date: Sun, 9 Mar 2008 16:28:31 +0000 Subject: Improve importscript error message when bcfg2.conf is not readable (Resolves Ticket #527) [bugfix] git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@4411 ce84e21b-d406-0410-9b95-82705330c041 --- src/lib/Server/Reports/importscript.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'src/lib/Server/Reports/importscript.py') diff --git a/src/lib/Server/Reports/importscript.py b/src/lib/Server/Reports/importscript.py index 1a4ccea23..34e6eef82 100755 --- a/src/lib/Server/Reports/importscript.py +++ b/src/lib/Server/Reports/importscript.py @@ -4,13 +4,10 @@ __revision__ = '$Revision$' import os, sys, binascii try: - import settings -except ImportError: - try: - import Bcfg2.Server.Reports.settings - except ImportError: - sys.stderr.write("Failed to locate settings.py. Is Bcfg2.Server.Reports python module installed?") - sys.exit(1) + import Bcfg2.Server.Reports.settings +except: + sys.stderr.write("Failed to load configuration settings. is /etc/bcfg2.conf readable?") + sys.exit(1) project_directory = os.path.dirname(settings.__file__) project_name = os.path.basename(project_directory) -- cgit v1.2.3-1-g7c22