tMerge branch 'master' of github.com:spesmilo/electrum - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit b4bb3c74499520d66a98271e9e011558abf5be83
DIR parent 972ba397d1eca79a3f6eddd4550480a198a6ae60
HTML Author: thomasv <thomasv@gitorious>
Date: Wed, 20 Feb 2013 13:10:38 +0100
Merge branch 'master' of github.com:spesmilo/electrum
Diffstat:
M lib/util.py | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
---
DIR diff --git a/lib/util.py b/lib/util.py
t@@ -30,15 +30,16 @@ def print_json(obj):
def check_windows_wallet_migration():
- if os.path.exists(os.path.join(os.environ["LOCALAPPDATA"], "Electrum")):
- if os.path.exists(os.path.join(os.environ["APPDATA"], "Electrum")):
- print_msg("Two Electrum folders have been found, the default Electrum location for Windows has changed from %s to %s since Electrum 1.7, please check your wallets and fix the problem manually." % (os.environ["LOCALAPPDATA"], os.environ["APPDATA"]))
- sys.exit()
- try:
- shutil.move(os.path.join(os.environ["LOCALAPPDATA"], "Electrum"), os.path.join(os.environ["APPDATA"]))
- print_msg("Your wallet has been moved from %s to %s."% (os.environ["LOCALAPPDATA"], os.environ["APPDATA"]))
- except:
- print_msg("Failed to move your wallet.")
+ if platform.release() != "XP":
+ if os.path.exists(os.path.join(os.environ["LOCALAPPDATA"], "Electrum")):
+ if os.path.exists(os.path.join(os.environ["APPDATA"], "Electrum")):
+ print_msg("Two Electrum folders have been found, the default Electrum location for Windows has changed from %s to %s since Electrum 1.7, please check your wallets and fix the problem manually." % (os.environ["LOCALAPPDATA"], os.environ["APPDATA"]))
+ sys.exit()
+ try:
+ shutil.move(os.path.join(os.environ["LOCALAPPDATA"], "Electrum"), os.path.join(os.environ["APPDATA"]))
+ print_msg("Your wallet has been moved from %s to %s."% (os.environ["LOCALAPPDATA"], os.environ["APPDATA"]))
+ except:
+ print_msg("Failed to move your wallet.")
def user_dir():