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 4

fix(mac_brew_pkg): avoid using cmd.run on 'None' executable path

Browse source 
* Sindicate fetching os brew path for use also on __virtual__ method
without running an extra command at this moment

Signed-off-by: Antonio Ramón Sánchez Morales <antonioramonsm@gmail.com>
This commit is contained in:
Antonio Ramón Sánchez Morales 2023-06-27 19:58:53 +02:00 • committed by Megan Wilhite
parent 8e7c528d17
commit 2e7b0ac875
1 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
salt/modules/mac_brew_pkg.py
View file

@ -31,7 +31,7 @@ def __virtual__():
"""
if __grains__["os"] != "MacOS":
return False, "brew module is macos specific"
if not _homebrew_bin():
if not _homebrew_os_bin():
return False, "The 'brew' binary was not found"
return __virtualname__
@ -93,16 +93,26 @@ def _tap(tap, runas=None):
return True
def _homebrew_os_bin():
"""
Fetch PATH binary brew full path eg: /usr/local/bin/brew (symbolic link)
"""
return salt.utils.path.which("brew")
def _homebrew_bin():
"""
Returns the full path to the homebrew binary in the PATH
Returns the full path to the homebrew binary in the homebrew installation folder
"""
# Fetch PATH binary brew full path eg: /usr/local/bin/brew (symbolic link)
brew = salt.utils.path.which("brew")
# Fetch and ret brew installation folder full path eg: /opt/homebrew/bin/brew
ret = __salt__["cmd.run"](f"{brew} --prefix", output_loglevel="trace")
ret += "/bin/brew"
return ret
brew = _homebrew_os_bin()
if not brew:
# Return None in case we don't have brew installed, so we prevent calling cmd.run for 'None' executable path
return None
else:
# Fetch and ret brew installation folder full path eg: /opt/homebrew/bin/brew
ret = __salt__["cmd.run"](f"{brew} --prefix", output_loglevel="trace")
ret += "/bin/brew"
return ret
def _call_brew(*cmd, failhard=True):