diff --git a/envsetup.py b/envsetup.py index 539a8baed9dff65c29911c1c2b650157f964bdb9..e52df8aef21bff5161bc852777ee3b3e05923004 100755 --- a/envsetup.py +++ b/envsetup.py @@ -61,7 +61,10 @@ class EnvSetup(): log('This script should be run as root user.') sys.exit(1) # Load conf - utils.load_conf() + conf = utils.load_conf() + if not conf: + log('No configuration loaded.') + sys.exit(1) if args: # Run command for arg in args: diff --git a/utils.py b/utils.py index 547bf73914289b35c374b8c0a67480f18d832847..c6badef48dffed5cc47268d091bad55971097361 100644 --- a/utils.py +++ b/utils.py @@ -52,7 +52,7 @@ def load_conf(): if not os.path.exists(path): log('The configuration file for EnvSetup script does not exist.\nPath of configuration file: %s' % path, error=True) if is_default: - sys.exit(1) + return dict() # Load conf with open(path, 'r') as fo: content = fo.read()