Bitmessage/PyBitmessage-2025-02-02
Archived
2
0
Fork 0
Code Issues 167 Pull Requests 53 Actions Packages Projects Releases 5 Wiki Activity

Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage

Browse Source 
fixed with origin bitmessage
This commit is contained in:
bartekn80 2013-07-15 19:07:09 +02:00
commit 0227fbe8e7
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/bitmessagemain.py
View File

@ -720,7 +720,6 @@ if __name__ == "__main__":
helper_bootstrap.knownNodes() helper_bootstrap.knownNodes()
helper_bootstrap.dns() helper_bootstrap.dns()
# Start the address generation thread # Start the address generation thread
addressGeneratorThread = addressGenerator() addressGeneratorThread = addressGenerator()
addressGeneratorThread.daemon = True # close the main program even if there are threads left addressGeneratorThread.daemon = True # close the main program even if there are threads left

13
src/shared.py
View File

@ -118,8 +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:
logger.critical('Could not find home folder, please report this message and your ' stringToLog = '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.') if 'logger' in globals():
logger.critical(stringToLog)
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:
@ -133,8 +136,12 @@ 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:
logger.info("Moving data folder to %s" % (dataFolder))
move(path.join(environ["HOME"], ".%s" % APPNAME), dataFolder) move(path.join(environ["HOME"], ".%s" % APPNAME), dataFolder)
stringToLog = "Moving data folder to %s" % (dataFolder)
if 'logger' in globals():
logger.info(stringToLog)
else:
print stringToLog
except IOError: except IOError:
pass pass
dataFolder = dataFolder + '/' dataFolder = dataFolder + '/'