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

Merge pull request #22954 from rallytime/bp-22909

Browse source 
Backport #22909 to 2014.7
This commit is contained in:
Justin Findlay 2015-04-22 12:56:20 -06:00
commit 46ef227911
1 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
salt/modules/pkgin.py
View file

@ -41,7 +41,7 @@ def _check_pkgin():
@decorators.memoize
def _supports_regex():
def _get_version():
'''
Get the pkgin version
'''
@ -57,7 +57,25 @@ def _supports_regex():
if not version_match:
return False
return tuple([int(i) for i in version_match.group(1).split('.')]) > (0, 5)
return version_match.group(1).split('.')
@decorators.memoize
def _supports_regex():
'''
Check support of regexp
'''
return tuple([int(i) for i in _get_version()]) > (0, 5)
@decorators.memoize
def _supports_parsing():
'''
Check support of parsing
'''
return tuple([int(i) for i in _get_version()]) > (0, 7)
def __virtual__():
@ -74,7 +92,7 @@ def __virtual__():
def _splitpkg(name):
# name is in the format foobar-1.0nb1, already space-splitted
if name[0].isalnum() and name != 'No': # avoid < > = and 'No result'
return name.rsplit('-', 1)
return name.split(';', 1)[0].rsplit('-', 1)
def search(pkg_name):
@ -230,7 +248,10 @@ def list_pkgs(versions_as_list=False, **kwargs):
out = __salt__['cmd.run'](pkg_command, output_loglevel='trace')
for line in out.splitlines():
try:
pkg, ver = line.split(' ')[0].rsplit('-', 1)
if _supports_parsing():
pkg, ver = line.split(';', 1)[0].rsplit('-', 1)
else:
pkg, ver = line.split(' ', 1)[0].rsplit('-', 1)
except ValueError:
continue
__salt__['pkg_resource.add_pkg'](ret, pkg, ver)