tMerge pull request #2029 from anduck/patch-2 - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 4e564651a5277baf626fc67bd301900559856b9d
DIR parent 77d5450081972e9300422396ae8a550e358e702a
HTML Author: ThomasV <thomasv@electrum.org>
Date: Fri, 16 Dec 2016 09:57:53 +0100
Merge pull request #2029 from anduck/patch-2
Trezor firmware version check bugfix and log on error
Diffstat:
M plugins/trezor/clientbase.py | 2 +-
M plugins/trezor/plugin.py | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
---
DIR diff --git a/plugins/trezor/clientbase.py b/plugins/trezor/clientbase.py
t@@ -212,7 +212,7 @@ class TrezorClientBase(GuiMixin, PrintError):
return (f.major_version, f.minor_version, f.patch_version)
def atleast_version(self, major, minor=0, patch=0):
- return cmp(self.firmware_version(), (major, minor, patch))
+ return cmp(self.firmware_version(), (major, minor, patch)) >= 0
@staticmethod
def wrapper(func):
DIR diff --git a/plugins/trezor/plugin.py b/plugins/trezor/plugin.py
t@@ -126,6 +126,7 @@ class TrezorCompatiblePlugin(HW_PluginBase):
msg = (_('Outdated %s firmware for device labelled %s. Please '
'download the updated firmware from %s') %
(self.device, client.label(), self.firmware_URL))
+ self.print_error(msg)
handler.show_error(msg)
return None