From 6412bdf003a94a7eb60e6aa01e98315ec7a464c2 Mon Sep 17 00:00:00 2001 From: Daniel Jaouen Date: Fri, 28 Mar 2014 19:20:51 -0400 Subject: [PATCH 1/2] Update homebrew module. --- library/packaging/homebrew | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/library/packaging/homebrew b/library/packaging/homebrew index 12fbf89c0f..249dee33f0 100644 --- a/library/packaging/homebrew +++ b/library/packaging/homebrew @@ -362,16 +362,18 @@ class Homebrew(object): cmd = [ "{brew_path}".format(brew_path=self.brew_path), - "list", - "-m1", + "info", + self.current_package, ] rc, out, err = self.module.run_command(cmd) - packages = [package for package in out.split('\n') if package] + for line in out.split('\n'): + if ( + re.search(r'Built from source', line) + or re.search(r'Poured from bottle', line) + ): + return True - if rc == 0 and self.current_package in packages: - return True - else: - return False + return False def _outdated_packages(self): rc, out, err = self.module.run_command([ From 7f6d2a94afd2137bf32bd2fefb3ff0657dc60c1b Mon Sep 17 00:00:00 2001 From: Daniel Jaouen Date: Fri, 28 Mar 2014 19:37:05 -0400 Subject: [PATCH 2/2] Miscellaneous fixes to homebrew module. --- library/packaging/homebrew | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/packaging/homebrew b/library/packaging/homebrew index 249dee33f0..38413fa3c4 100644 --- a/library/packaging/homebrew +++ b/library/packaging/homebrew @@ -539,7 +539,7 @@ class Homebrew(object): cmd = [opt for opt in opts if opt] rc, out, err = self.module.run_command(cmd) - if not self._current_package_is_outdated(): + if self._current_package_is_installed() and not self._current_package_is_outdated(): self.changed_count += 1 self.changed = True self.message = 'Package upgraded: {0}'.format(self.current_package)