Added fall back print statements in case logger is unavailable

This commit is contained in:
DivineOmega 2013-07-15 10:56:13 +01:00
parent d900b9de70
commit 3107150ace

View File

@ -118,9 +118,11 @@ 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:
stringToLog = 'Could not find home folder, please report this message and your OS X version to the BitMessage Github.'
if 'logger' in globals(): if 'logger' in globals():
logger.critical('Could not find home folder, please report this message and your ' logger.critical(stringToLog)
'OS X version to the BitMessage Github.') else:
print stringToLog
sys.exit() sys.exit()
elif 'win32' in sys.platform or 'win64' in sys.platform: elif 'win32' in sys.platform or 'win64' in sys.platform:
@ -134,8 +136,11 @@ 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:
stringToLog = "Moving data folder to %s" % (dataFolder)
if 'logger' in globals(): if 'logger' in globals():
logger.info("Moving data folder to %s" % (dataFolder)) logger.info(stringToLog)
else:
print stringToLog
move(path.join(environ["HOME"], ".%s" % APPNAME), dataFolder) move(path.join(environ["HOME"], ".%s" % APPNAME), dataFolder)
except IOError: except IOError:
pass pass