tauto-upgrade wallet format - electrum - Electrum Bitcoin wallet HTML git clone https://git.parazyd.org/electrum DIR Log DIR Files DIR Refs DIR Submodules --- DIR commit da65e9e7d5b2d27306e2b1f09b263a0b5e7f343c DIR parent fa487ae0cad1468b9c302a4cc51ec1077432b41f HTML Author: ThomasV <thomasv@electrum.org> Date: Thu, 29 Sep 2016 10:52:51 +0200 auto-upgrade wallet format Diffstat: M lib/daemon.py | 3 --- M lib/storage.py | 4 +++- 2 files changed, 3 insertions(+), 4 deletions(-) --- DIR diff --git a/lib/daemon.py b/lib/daemon.py t@@ -187,9 +187,6 @@ class Daemon(DaemonThread): storage = WalletStorage(path) if not storage.file_exists: return - if storage.requires_upgrade() and 'ANDROID_DATA' in os.environ: - self.print_error('upgrading wallet format') - storage.upgrade() if storage.requires_split() or storage.requires_upgrade() or storage.get_action(): return wallet = Wallet(storage) DIR diff --git a/lib/storage.py b/lib/storage.py t@@ -60,7 +60,9 @@ class WalletStorage(PrintError): self.print_error("wallet path", self.path) if self.path: self.read(self.path) - + if self.requires_upgrade(): + self.print_error('upgrading wallet format') + self.upgrade() # check here if I need to load a plugin t = self.get('wallet_type') l = plugin_loaders.get(t)