saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Update openbsdpkg.py

Browse source 
* It looks like function 'pkg_resource.compare' used in orig. file is obsolete, 
* change correcting following exception, when comparing currently installed and latest available package versions: 

~~~ 
   The minion function caused an exception: Traceback (most recent call last):
      File "/usr/local/lib/python2.7/site-packages/salt/minion.py", line 1161, in _thread_return
        return_data = func(*args, **kwargs)
      File "/usr/local/lib/python2.7/site-packages/salt/modules/openbsdpkg.py", line 108, in latest_version
        if not cur or __salt__['pkg_resource.compare'](pkg1=cur,
      File "/usr/local/lib/python2.7/site-packages/salt/utils/lazy.py", line 90, in __getitem__
        raise KeyError(key)
    KeyError: 'pkg_resource.compare'
~~
This commit is contained in:
serge-p 2015-08-27 00:30:00 -04:00 • committed by Erik Johnson
parent 0b17f80fe9
commit 4aec926476
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
salt/modules/openbsdpkg.py
View file

@ -105,9 +105,9 @@ def latest_version(*names, **kwargs):
continue
pkgname += '--{0}'.format(flavor) if flavor else ''
cur = pkgs.get(pkgname, '')
if not cur or __salt__['pkg_resource.compare'](pkg1=cur,
oper='<',
pkg2=pkgver):
if not cur or salt.utils.compare_versions(ver1=cur,
oper='<',
ver2=pkgver):
ret[pkgname] = pkgver
# Return a string if only one package name passed