Merge pull request #7259 from terminalmage/issue7257

Fix regression in pkg.latest_version
This commit is contained in:
Thomas S Hatch 2013-09-15 19:29:28 -07:00
commit 64b6c5152a
11 changed files with 0 additions and 23 deletions

View File

@ -137,9 +137,6 @@ def latest_version(*names, **kwargs):
kwargs.pop('fromrepo', None)
kwargs.pop('repo', None)
if kwargs:
raise TypeError('Got unexpected keyword argument(s): {0!r}'.format(kwargs))
if len(names) == 0:
return ''
ret = {}

View File

@ -121,8 +121,6 @@ def latest_version(*names, **kwargs):
salt '*' pkg.latest_version <package1> <package2> <package3>
'''
kwargs.pop('refresh', True)
if kwargs:
raise TypeError('Got unexpected keyword argument(s): {0!r}'.format(kwargs))
if len(names) <= 1:
return ''

View File

@ -171,8 +171,6 @@ def latest_version(*names, **kwargs):
salt '*' pkg.latest_version <package1> <package2> <package3> ...
'''
refresh = salt.utils.is_true(kwargs.pop('refresh', True))
if kwargs:
raise TypeError('Got unexpected keyword argument(s): {0!r}'.format(kwargs))
if len(names) == 0:
return ''

View File

@ -69,8 +69,6 @@ def latest_version(*names, **kwargs):
'''
refresh = salt.utils.is_true(kwargs.pop('refresh', True))
if kwargs:
raise TypeError('Got unexpected keyword argument(s): {0!r}'.format(kwargs))
ret = {}

View File

@ -81,8 +81,6 @@ def latest_version(*names, **kwargs):
salt '*' pkg.latest_version <package name>
'''
kwargs.pop('refresh', True)
if kwargs:
raise TypeError('Got unexpected keyword argument(s): {0!r}'.format(kwargs))
pkgs = list_pkgs()
ret = {}

View File

@ -45,8 +45,6 @@ def latest_version(*names, **kwargs):
salt '*' pkg.latest_version <package1> <package2> <package3> ...
'''
refresh = salt.utils.is_true(kwargs.pop('refresh', True))
if kwargs:
raise TypeError('Got unexpected keyword argument(s): {0!r}'.format(kwargs))
if len(names) == 0:
return ''

View File

@ -113,8 +113,6 @@ def latest_version(*names, **kwargs):
'''
refresh = salt.utils.is_true(kwargs.pop('refresh', True))
if kwargs:
raise TypeError('Got unexpected keyword argument(s): {0!r}'.format(kwargs))
pkglist = {}
pkgin = _check_pkgin()

View File

@ -73,8 +73,6 @@ def latest_version(pkg_name, **kwargs):
'''
kwargs.pop('refresh', True)
if kwargs:
raise TypeError('Got unexpected keyword argument(s): {0!r}'.format(kwargs))
cmd = 'pkg info {0}'.format(pkg_name)
out = __salt__['cmd.run'](cmd).split()

View File

@ -186,8 +186,6 @@ def latest_version(*names, **kwargs):
salt '*' pkgutil.latest_version <package1> <package2> <package3> ...
'''
refresh = salt.utils.is_true(kwargs.pop('refresh', True))
if kwargs:
raise TypeError('Got unexpected keyword argument(s): {0!r}'.format(kwargs))
if not names:
return ''

View File

@ -128,8 +128,6 @@ def latest_version(*names, **kwargs):
package.
'''
kwargs.pop('refresh', True)
if kwargs:
raise TypeError('Got unexpected keyword argument(s): {0!r}'.format(kwargs))
ret = {}
if not names:

View File

@ -74,8 +74,6 @@ def latest_version(*names, **kwargs):
salt '*' pkg.latest_version <package1> <package2> <package3> ...
'''
refresh = salt.utils.is_true(kwargs.pop('refresh', True))
if kwargs:
raise TypeError('Got unexpected keyword argument(s): {0!r}'.format(kwargs))
if len(names) == 0:
return ''