Added check for logger global before attempting to log in places where logging may occur before the logger is ready

This commit is contained in:
DivineOmega 2013-07-15 10:49:01 +01:00
parent b500a01c33
commit d900b9de70

View File

@ -118,6 +118,7 @@ def lookupAppdataFolder():
if "HOME" in environ: if "HOME" in environ:
dataFolder = path.join(os.environ["HOME"], "Library/Application Support/", APPNAME) + '/' dataFolder = path.join(os.environ["HOME"], "Library/Application Support/", APPNAME) + '/'
else: else:
if 'logger' in globals():
logger.critical('Could not find home folder, please report this message and your ' logger.critical('Could not find home folder, please report this message and your '
'OS X version to the BitMessage Github.') 'OS X version to the BitMessage Github.')
sys.exit() sys.exit()
@ -133,6 +134,7 @@ def lookupAppdataFolder():
# Migrate existing data to the proper location if this is an existing install # Migrate existing data to the proper location if this is an existing install
try: try:
if 'logger' in globals():
logger.info("Moving data folder to %s" % (dataFolder)) logger.info("Moving data folder to %s" % (dataFolder))
move(path.join(environ["HOME"], ".%s" % APPNAME), dataFolder) move(path.join(environ["HOME"], ".%s" % APPNAME), dataFolder)
except IOError: except IOError: