From cfc52e6441cd9301ca7efcf4622edd81c80b94a8 Mon Sep 17 00:00:00 2001 From: SomberNight Date: Fri, 1 Jun 2018 22:19:00 +0200 Subject: [PATCH] follow-up #4396: new 2fa wallets could not be created --- lib/storage.py | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/lib/storage.py b/lib/storage.py index 356673d79..06ef33175 100644 --- a/lib/storage.py +++ b/lib/storage.py @@ -578,17 +578,14 @@ class WalletStorage(PrintError): return True def get_action(self): - if self.file_exists(): - action = run_hook('get_action', self) - if action and self.requires_upgrade(): + action = run_hook('get_action', self) + if self.file_exists() and self.requires_upgrade(): + if action: raise WalletFileException(_('Incomplete wallet files cannot be upgraded.')) - elif self.requires_upgrade(): - return 'upgrade_storage' - elif action: - return action - else: - return None - else: + return 'upgrade_storage' + if action: + return action + if not self.file_exists(): return 'new' def get_seed_version(self):