From 24da38415e79f79febc7568d085d51485c5471ee Mon Sep 17 00:00:00 2001 From: Maran Date: Wed, 16 Jan 2013 14:45:07 +0100 Subject: [PATCH] Rolled back original compare code --- lib/gui_qt.py | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/lib/gui_qt.py b/lib/gui_qt.py index be19aab8..141ece11 100644 --- a/lib/gui_qt.py +++ b/lib/gui_qt.py @@ -85,20 +85,9 @@ class UpdateLabel(QtGui.QLabel): def compare_versions(self, version1, version2): - parts1 = [int(x) for x in version1.split('.')] - parts2 = [int(x) for x in version2.split('.')] - - # fill up the shorter version with zeros ... - lendiff = len(parts1) - len(parts2) - if lendiff > 0: - parts2.extend([0] * lendiff) - elif lendiff < 0: - parts1.extend([0] * (-lendiff)) - - for i, p in enumerate(parts1): - ret = cmp(p, parts2[i]) - if ret: return ret - return 0 + def normalize(v): + return [int(x) for x in re.sub(r'(\.0+)*$','', v).split(".")] + return cmp(normalize(version1), normalize(version2)) def ignore_this_version(self): self.setText("")