cis-kuldeep/PyBitmessage-2021-04-27
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'no_propagate_loggers' into keyfile_perm_fix

Browse Source 
Conflicts:
	src/shared.py
This commit is contained in:
Gregor Robinson 2013-07-10 20:24:23 +01:00
commit 718de832ab
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/shared.py
View File

@ -25,6 +25,7 @@ from addresses import *
from debug import logger from debug import logger
import highlevelcrypto import highlevelcrypto
import shared import shared
from debug import logger
config = ConfigParser.SafeConfigParser() config = ConfigParser.SafeConfigParser()
@ -135,14 +136,13 @@ def lookupAppdataFolder():
dataFolder = path.join(environ["XDG_CONFIG_HOME"], APPNAME) dataFolder = path.join(environ["XDG_CONFIG_HOME"], APPNAME)
except KeyError: except KeyError:
dataFolder = path.join(environ["HOME"], ".config", APPNAME) dataFolder = path.join(environ["HOME"], ".config", APPNAME)
# 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
if not os.path.exists(dataFolder):
try: try:
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)
dataFolder = dataFolder
except IOError: except IOError:
dataFolder = dataFolder pass
dataFolder = dataFolder + '/' dataFolder = dataFolder + '/'
return dataFolder return dataFolder
@ -277,8 +277,9 @@ def doCleanShutdown():
broadcastToSendDataQueues((0, 'shutdown', 'all')) broadcastToSendDataQueues((0, 'shutdown', 'all'))
logger.info('Flushing inventory in memory out to disk...') logger.info('Flushing inventory in memory out to disk...')
UISignalQueue.put(('updateStatusBar','Flushing inventory in memory out to disk. ' UISignalQueue.put((
'This should normally only take a second...')) 'updateStatusBar',
'Flushing inventory in memory out to disk. This should normally only take a second...'))
flushInventory() flushInventory()
# This one last useless query will guarantee that the previous flush committed before we close # This one last useless query will guarantee that the previous flush committed before we close