From bd61be6981f7a0da7a3d7c5d5b1a23926e9f916c Mon Sep 17 00:00:00 2001 From: lilydjwg Date: Mon, 6 Feb 2017 15:54:21 +0800 Subject: [PATCH] compare oldver and newver using == instead of version comparison closes #45 and archlinuxcn/repo#351 --- README.rst | 6 ------ nvchecker/__init__.py | 2 +- nvchecker/core.py | 5 +---- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/README.rst b/README.rst index ed19f16..7bc4b15 100644 --- a/README.rst +++ b/README.rst @@ -113,12 +113,6 @@ oldver newver Specify a version record file to store the new version info. -sort_version_key - Sort the version string using this key function. Choose between ``parse_version`` and - ``vercmp``. Default value is ``parse_version``. ``parse_version`` use - ``pkg_resources.parse_version``. ``vercmp`` use ``pyalpm.vercmp``. - - Search in a Webpage ------------------- Search through a specific webpage for the version string. This type of version finding has these fields: diff --git a/nvchecker/__init__.py b/nvchecker/__init__.py index 908c0bb..bb5adba 100644 --- a/nvchecker/__init__.py +++ b/nvchecker/__init__.py @@ -1 +1 @@ -__version__ = '0.4.3' +__version__ = '0.4.4dev' diff --git a/nvchecker/core.py b/nvchecker/core.py index 67bf2c2..b8c43a7 100644 --- a/nvchecker/core.py +++ b/nvchecker/core.py @@ -9,7 +9,6 @@ from tornado.stack_context import ExceptionStackContext from .lib import nicelogger from .get_version import get_version -from .sortversion import sort_version_keys from . import __version__ @@ -62,7 +61,6 @@ class Source: started = False tasks = 0 oldver = newver = None - sort_version_key = None def __init__(self, file): self.config = config = configparser.ConfigParser( dict_type=dict, allow_no_value=True @@ -74,7 +72,6 @@ class Source: d = os.path.dirname(file.name) self.oldver = os.path.expandvars(os.path.expanduser(os.path.join(d, c.get('oldver')))) self.newver = os.path.expandvars(os.path.expanduser(os.path.join(d, c.get('newver')))) - self.sort_version_key = sort_version_keys[c.get("sort_version_key", "parse_version")] def check(self): self.started = True @@ -115,7 +112,7 @@ class Source: return oldver = self.oldvers.get(name, None) - if not oldver or self.sort_version_key(oldver) < self.sort_version_key(version): + if not oldver or oldver != version: logger.info('%s updated version %s', name, version) self.curvers[name] = version self.on_update(name, version, oldver)