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

Merge pull request #7969 from dedalusj/devel

Browse source 
Fixed bug with environment path for homebrew_cask
This commit is contained in:
Michael DeHaan 2014-07-28 10:49:04 -04:00
commit 634952d15b
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
packaging/homebrew_cask
View file

@ -325,7 +325,7 @@ class HomebrewCask(object):
raise HomebrewCaskException(self.message) raise HomebrewCaskException(self.message)
cmd = [self.brew_path, 'cask', 'list'] cmd = [self.brew_path, 'cask', 'list']
rc, out, err = self.module.run_command(cmd) rc, out, err = self.module.run_command(cmd, path_prefix=self.path[0])
if 'nothing to list' in err: if 'nothing to list' in err:
return False return False
@ -353,7 +353,7 @@ class HomebrewCask(object):
rc, out, err = self.module.run_command([ rc, out, err = self.module.run_command([
self.brew_path, self.brew_path,
'update', 'update',
]) ], path_prefix=self.path[0])
if rc == 0: if rc == 0:
if out and isinstance(out, basestring): if out and isinstance(out, basestring):
already_updated = any( already_updated = any(
@ -399,7 +399,7 @@ class HomebrewCask(object):
for opt in (self.brew_path, 'cask', 'install', self.current_cask) for opt in (self.brew_path, 'cask', 'install', self.current_cask)
if opt] if opt]
rc, out, err = self.module.run_command(cmd) rc, out, err = self.module.run_command(cmd, path_prefix=self.path[0])
if self._current_cask_is_installed(): if self._current_cask_is_installed():
self.changed_count += 1 self.changed_count += 1
@ -444,7 +444,7 @@ class HomebrewCask(object):
for opt in (self.brew_path, 'cask', 'uninstall', self.current_cask) for opt in (self.brew_path, 'cask', 'uninstall', self.current_cask)
if opt] if opt]
rc, out, err = self.module.run_command(cmd) rc, out, err = self.module.run_command(cmd, path_prefix=self.path[0])
if not self._current_cask_is_installed(): if not self._current_cask_is_installed():
self.changed_count += 1 self.changed_count += 1