mirror of
https://github.com/valitydev/salt.git
synced 2024-11-07 08:58:59 +00:00
Merge pull request #25929 from sjorge/fix-pkgin-module
salt.module.pkgin's __virtual__() should not return None if pkg_info is not present
This commit is contained in:
commit
15b14b761f
@ -32,6 +32,7 @@ def _check_pkgin():
|
||||
ppath = salt.utils.which('pkgin')
|
||||
if ppath is None:
|
||||
# pkgin was not found in $PATH, try to find it via LOCALBASE
|
||||
try:
|
||||
localbase = __salt__['cmd.run'](
|
||||
'pkg_info -Q LOCALBASE pkgin',
|
||||
output_loglevel='trace'
|
||||
@ -40,7 +41,8 @@ def _check_pkgin():
|
||||
ppath = '{0}/bin/pkgin'.format(localbase)
|
||||
if not os.path.exists(ppath):
|
||||
return None
|
||||
|
||||
except CommandExecutionError:
|
||||
return None
|
||||
return ppath
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user