ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-04-21 01:41:25 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

homebrew: fix incorrect handling of aliases (#9255)

Browse source 
* Add failing test (See commit description)

Second assert returns this:

changed: [localhost] => changed=true
  changed_pkgs:
  - sqlite3
  msg: 'Changed: 1, Unchanged: 1'
  unchanged_pkgs:
  - sqlite

* Extract proper package_name from brew info using alisases

* Add changelog fragment

* Fix pep8

* Make sure sqlite is uninstalled beforehand

* Use `package_result is (not) changed` syntax in assertions

* Register more explicit names

* Fix handling of casks
This commit is contained in:
Thibaut Decombe 2024-12-20 22:53:41 +01:00 • committed by GitHub
parent c5855d1a58
commit 9452a2c8ac
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 83 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

27
plugins/modules/homebrew.py
View file

@ -379,6 +379,20 @@ class Homebrew(object):
)
raise HomebrewException(self.message)
def _save_package_info(self, package_detail, package_name):
if bool(package_detail.get("installed")):
self.installed_packages.add(package_name)
if bool(package_detail.get("outdated")):
self.outdated_packages.add(package_name)
def _extract_package_name(self, package_detail, is_cask):
canonical_name = package_detail["token"] if is_cask else package_detail["name"] # For ex: 'sqlite'
all_valid_names = set(package_detail.get("aliases", [])) # For ex: {'sqlite3'}
all_valid_names.add(canonical_name)
# Then make sure the user provided name resurface.
return (all_valid_names & set(self.packages)).pop()
def _get_packages_info(self):
cmd = [
"{brew_path}".format(brew_path=self.brew_path),
@ -397,16 +411,13 @@ class Homebrew(object):
data = json.loads(out)
for package_detail in data.get("formulae", []):
if bool(package_detail.get("installed")):
self.installed_packages.add(package_detail["name"])
if bool(package_detail.get("outdated")):
self.outdated_packages.add(package_detail["name"])
package_name = self._extract_package_name(package_detail, is_cask=False)
self._save_package_info(package_detail, package_name)
for package_detail in data.get("casks", []):
if bool(package_detail.get("installed")):
self.installed_packages.add(package_detail["token"])
if bool(package_detail.get("outdated")):
self.outdated_packages.add(package_detail["token"])
package_name = self._extract_package_name(package_detail, is_cask=True)
self._save_package_info(package_detail, package_name)
# /prep -------------------------------------------------------- }}}
def run(self):