A round of bugfixing this thing into existence

This commit is contained in:
Scott Kitterman
2018-02-13 03:49:31 -05:00
parent 01503a81ec
commit 396ee7dfe0
2 changed files with 13 additions and 10 deletions
+5 -5
View File
@@ -53,23 +53,23 @@ class ConfigException(Exception):
####################################################################
def processConfigFile(filename = None, config = None, useSyslog = 1,
def _processConfigFile(filename = None, configdata = None, useSyslog = 1,
useStderr = 0):
'''Load the specified config file, exit and log errors if it fails,
otherwise return a config dictionary.'''
import policydspfsupp
if config == None: config = policydspfsupp.defaultConfigData
import config
if configdata == None: configdata = config.defaultConfigData
if filename != None:
try:
readConfigFile(filename, config)
readConfigFile(filename, configdata)
except Exception, e:
if useSyslog:
syslog.syslog(e.args[0])
if useStderr:
sys.stderr.write('%s\n' % e.args[0])
sys.exit(1)
return(config)
return(configdata)
#################