a-c-m
/
community.general
mirror of https://github.com/ansible-collections/community.general.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove redundant `HomebrewValidate.valid_package` calls in homebrew module. (#9076) 

* Remove redundant `HomebrewValidate.valid_package` calls

* Add changelog fragment
pull/9143/head
Thibaut Decombe 2024-11-16 18:34:47 +01:00 committed by GitHub
parent 523439ab62
commit 626c0e1049
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changelogs/fragments/9076-remove-duplicated-homebrew-package-name-validation.yml Normal file
View File

@ -0,0 +1,2 @@
minor_changes:
- homebrew - remove duplicated package name validation (https://github.com/ansible-collections/community.general/pull/9076).

37
plugins/modules/homebrew.py
View File

@ -401,11 +401,6 @@ class Homebrew(object):
# checks ------------------------------------------------------- {{{ # checks ------------------------------------------------------- {{{
def _current_package_is_installed(self): def _current_package_is_installed(self):
if not HomebrewValidate.valid_package(self.current_package):
self.failed = True
self.message = 'Invalid package: {0}.'.format(self.current_package)
raise HomebrewException(self.message)
cmd = [ cmd = [
"{brew_path}".format(brew_path=self.brew_path), "{brew_path}".format(brew_path=self.brew_path),
"info", "info",
@ -424,9 +419,6 @@ class Homebrew(object):
return _check_package_in_json(data, "formulae") or _check_package_in_json(data, "casks") return _check_package_in_json(data, "formulae") or _check_package_in_json(data, "casks")
def _current_package_is_outdated(self): def _current_package_is_outdated(self):
if not HomebrewValidate.valid_package(self.current_package):
return False
rc, out, err = self.module.run_command([ rc, out, err = self.module.run_command([
self.brew_path, self.brew_path,
'outdated', 'outdated',
@ -436,9 +428,7 @@ class Homebrew(object):
return rc != 0 return rc != 0
def _current_package_is_installed_from_head(self): def _current_package_is_installed_from_head(self):
if not HomebrewValidate.valid_package(self.current_package): if not self._current_package_is_installed():
return False
elif not self._current_package_is_installed():
return False return False
rc, out, err = self.module.run_command([ rc, out, err = self.module.run_command([
@ -534,11 +524,6 @@ class Homebrew(object):
# installed ------------------------------ {{{ # installed ------------------------------ {{{
def _install_current_package(self): def _install_current_package(self):
if not HomebrewValidate.valid_package(self.current_package):
self.failed = True
self.message = 'Invalid package: {0}.'.format(self.current_package)
raise HomebrewException(self.message)
if self._current_package_is_installed(): if self._current_package_is_installed():
self.unchanged_count += 1 self.unchanged_count += 1
self.unchanged_pkgs.append(self.current_package) self.unchanged_pkgs.append(self.current_package)
@ -595,11 +580,6 @@ class Homebrew(object):
def _upgrade_current_package(self): def _upgrade_current_package(self):
command = 'upgrade' command = 'upgrade'
if not HomebrewValidate.valid_package(self.current_package):
self.failed = True
self.message = 'Invalid package: {0}.'.format(self.current_package)
raise HomebrewException(self.message)
current_package_is_installed = self._current_package_is_installed() current_package_is_installed = self._current_package_is_installed()
if not current_package_is_installed: if not current_package_is_installed:
command = 'install' command = 'install'
@ -667,11 +647,6 @@ class Homebrew(object):
# uninstalled ---------------------------- {{{ # uninstalled ---------------------------- {{{
def _uninstall_current_package(self): def _uninstall_current_package(self):
if not HomebrewValidate.valid_package(self.current_package):
self.failed = True
self.message = 'Invalid package: {0}.'.format(self.current_package)
raise HomebrewException(self.message)
if not self._current_package_is_installed(): if not self._current_package_is_installed():
self.unchanged_count += 1 self.unchanged_count += 1
self.unchanged_pkgs.append(self.current_package) self.unchanged_pkgs.append(self.current_package)
@ -716,11 +691,6 @@ class Homebrew(object):
# linked --------------------------------- {{{ # linked --------------------------------- {{{
def _link_current_package(self): def _link_current_package(self):
if not HomebrewValidate.valid_package(self.current_package):
self.failed = True
self.message = 'Invalid package: {0}.'.format(self.current_package)
raise HomebrewException(self.message)
if not self._current_package_is_installed(): if not self._current_package_is_installed():
self.failed = True self.failed = True
self.message = 'Package not installed: {0}.'.format(self.current_package) self.message = 'Package not installed: {0}.'.format(self.current_package)
@ -763,11 +733,6 @@ class Homebrew(object):
# unlinked ------------------------------- {{{ # unlinked ------------------------------- {{{
def _unlink_current_package(self): def _unlink_current_package(self):
if not HomebrewValidate.valid_package(self.current_package):
self.failed = True
self.message = 'Invalid package: {0}.'.format(self.current_package)
raise HomebrewException(self.message)
if not self._current_package_is_installed(): if not self._current_package_is_installed():
self.failed = True self.failed = True
self.message = 'Package not installed: {0}.'.format(self.current_package) self.message = 'Package not installed: {0}.'.format(self.current_package)