cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #732 from tobywf/homebrew_validation

Browse source 
Homebrew: Allow colons, direct check for outdated formula
This commit is contained in:
Brian Coca 2015-10-07 21:22:02 -04:00
commit 5302de2686
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
packaging/os/homebrew.py
View file

@ -121,6 +121,7 @@ class Homebrew(object):
/ # slash (for taps) / # slash (for taps)
\+ # plusses \+ # plusses
- # dashes - # dashes
: # colons (for URLs)
''' '''
INVALID_PATH_REGEX = _create_regex_group(VALID_PATH_CHARS) INVALID_PATH_REGEX = _create_regex_group(VALID_PATH_CHARS)
@ -396,18 +397,17 @@ class Homebrew(object):
return False return False
def _outdated_packages(self):
rc, out, err = self.module.run_command([
self.brew_path,
'outdated',
])
return [line.split(' ')[0].strip() for line in out.split('\n') if line]
def _current_package_is_outdated(self): def _current_package_is_outdated(self):
if not self.valid_package(self.current_package): if not self.valid_package(self.current_package):
return False return False
return self.current_package in self._outdated_packages() rc, out, err = self.module.run_command([
self.brew_path,
'outdated',
self.current_package,
])
return rc != 0
def _current_package_is_installed_from_head(self): def _current_package_is_installed_from_head(self):
if not Homebrew.valid_package(self.current_package): if not Homebrew.valid_package(self.current_package):