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 #47045 from tankywoo/fix-gentoo-pkg-installed

Browse source 
Fix ba7d00f5 for gentoo pkg.installed method
This commit is contained in:
Nicole Thomas 2018-04-17 09:55:44 -04:00 • committed by GitHub
commit 6c16a34c44
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
salt/modules/ebuild.py
View file

@ -90,6 +90,13 @@ def _p_to_cp(p):
except portage.exception.InvalidAtom:
pass
try:
ret = _porttree().dbapi.xmatch("match-all", p)
if ret:
return portage.cpv_getkey(ret[0])
except portage.exception.InvalidAtom:
pass
return None
@ -110,6 +117,13 @@ def _cpv_to_cp(cpv):
except portage.exception.InvalidAtom:
pass
try:
ret = portage.cpv_getkey(cpv)
if ret:
return ret
except portage.exception.InvalidAtom:
pass
return cpv

7
salt/modules/portage_config.py
View file

@ -111,6 +111,13 @@ def _p_to_cp(p):
except portage.exception.InvalidAtom:
pass
try:
ret = _porttree().dbapi.xmatch("match-all", p)
if ret:
return portage.cpv_getkey(ret[0])
except portage.exception.InvalidAtom:
pass
return None