From 7a6203eb5092e7b8db7954f290e420ced7a4f855 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20=C3=81lvaro?= Date: Thu, 14 Dec 2023 18:29:46 +0100 Subject: [PATCH] feat(mac_brew_pkg): Remove some logs --- salt/modules/mac_brew_pkg.py | 22 ++++++---------------- salt/utils/rsax931.py | 2 +- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/salt/modules/mac_brew_pkg.py b/salt/modules/mac_brew_pkg.py index e2377761238..9166b0f5c88 100644 --- a/salt/modules/mac_brew_pkg.py +++ b/salt/modules/mac_brew_pkg.py @@ -137,9 +137,11 @@ def _homebrew_bin(quiet=False): quiet When ``True``, does not log warnings when the homebrew prefix cannot be found. """ - ret = homebrew_prefix(quiet=quiet) + ret = homebrew_prefix() if ret is not None: ret += "/bin/brew" + else: + log.warning("Failed to find homebrew prefix") return ret @@ -182,13 +184,10 @@ def _list_pkgs_from_context(versions_as_list): return ret -def homebrew_prefix(quiet=False): +def homebrew_prefix(): """ Returns the full path to the homebrew prefix. - quiet - When ``True``, does not log warnings when the homebrew prefix cannot be found. - CLI Example: .. code-block:: bash @@ -201,8 +200,6 @@ def homebrew_prefix(quiet=False): if env_homebrew_prefix in os.environ: log.debug(f"{env_homebrew_prefix} is set. Using it for homebrew prefix.") return os.environ[env_homebrew_prefix] - elif not quiet: - log.warning(f"{env_homebrew_prefix} is not set. Please, consider adding it.") # Try brew --prefix try: @@ -221,15 +218,8 @@ def homebrew_prefix(quiet=False): return ret except CommandExecutionError as e: - if not quiet: - log.warning( - f"Unable to find homebrew prefix by running 'brew --prefix'. Error: {str(e)}" - ) - - # Unable to find brew prefix - if not quiet: - log.warning( - f"Failed to find homebrew prefix. Please, set {env_homebrew_prefix} env variable" + log.debug( + f"Unable to find homebrew prefix by running 'brew --prefix'. Error: {str(e)}" ) return None diff --git a/salt/utils/rsax931.py b/salt/utils/rsax931.py index 6ff29d2df85..d84995e3cff 100644 --- a/salt/utils/rsax931.py +++ b/salt/utils/rsax931.py @@ -46,7 +46,7 @@ def _find_libcrypto(): # Find library symlinks in Homebrew locations. import salt.modules.mac_brew_pkg as mac_brew - brew_prefix = mac_brew.homebrew_prefix(quiet=True) + brew_prefix = mac_brew.homebrew_prefix() if brew_prefix is not None: lib = lib or glob.glob( os.path.join(brew_prefix, "opt/openssl/lib/libcrypto.dylib")