BioArchLinux/nvchecker
2
0
Fork 0
mirror of https://github.com/lilydjwg/nvchecker.git synced 2025-03-10 06:14:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

compare oldver and newver using == instead of version comparison

Browse source 
closes #45 and archlinuxcn/repo#351
This commit is contained in:
lilydjwg 2017-02-06 15:54:21 +08:00
parent 63a0161acf
commit bd61be6981
3 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
README.rst
View file

@ -113,12 +113,6 @@ oldver
newver newver
Specify a version record file to store the new version info. 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 in a Webpage
------------------- -------------------
Search through a specific webpage for the version string. This type of version finding has these fields: Search through a specific webpage for the version string. This type of version finding has these fields:

2
nvchecker/__init__.py
View file

@ -1 +1 @@
__version__ = '0.4.3' __version__ = '0.4.4dev'

5
nvchecker/core.py
View file

@ -9,7 +9,6 @@ from tornado.stack_context import ExceptionStackContext
from .lib import nicelogger from .lib import nicelogger
from .get_version import get_version from .get_version import get_version
from .sortversion import sort_version_keys
from . import __version__ from . import __version__
@ -62,7 +61,6 @@ class Source:
started = False started = False
tasks = 0 tasks = 0
oldver = newver = None oldver = newver = None
sort_version_key = None
def __init__(self, file): def __init__(self, file):
self.config = config = configparser.ConfigParser( self.config = config = configparser.ConfigParser(
dict_type=dict, allow_no_value=True dict_type=dict, allow_no_value=True
@ -74,7 +72,6 @@ class Source:
d = os.path.dirname(file.name) d = os.path.dirname(file.name)
self.oldver = os.path.expandvars(os.path.expanduser(os.path.join(d, c.get('oldver')))) 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.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): def check(self):
self.started = True self.started = True
@ -115,7 +112,7 @@ class Source:
return return
oldver = self.oldvers.get(name, None) 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) logger.info('%s updated version %s', name, version)
self.curvers[name] = version self.curvers[name] = version
self.on_update(name, version, oldver) self.on_update(name, version, oldver)