diff options
| author | Samuel John | 2013-06-04 22:33:24 +0200 |
|---|---|---|
| committer | Samuel John | 2013-06-04 22:33:24 +0200 |
| commit | 4dac954cdb811f2caabbea397e4f4fe4eb714a25 (patch) | |
| tree | 4640458224032428cc363d6421228725b1cb6270 /Library | |
| parent | 441f7f4576d6d257419d6e8ab7cfdf5ee240a062 (diff) | |
| download | brew-4dac954cdb811f2caabbea397e4f4fe4eb714a25.tar.bz2 | |
ENV.userpaths! Hotfix to prefer brewed stuff
The depends_on 'nose' => :python
tests fails even if people did `pip install nose`
with their brewed pythons because during
the tests the PATH is set up such that
/usr/bin comes before HOMEBRE_PREFIX/bin.
This is a hot fix. Proper fix need resorting
the PATH.
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/extend/ENV.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Library/Homebrew/extend/ENV.rb b/Library/Homebrew/extend/ENV.rb index 0eaa94255..273fa6e8c 100644 --- a/Library/Homebrew/extend/ENV.rb +++ b/Library/Homebrew/extend/ENV.rb @@ -440,6 +440,8 @@ class << ENV def userpaths! paths = ORIGINAL_PATHS.map { |p| p.realpath.to_s rescue nil } - %w{/usr/X11/bin /opt/X11/bin} self['PATH'] = paths.unshift(*self['PATH'].split(":")).uniq.join(":") + # XXX hot fix to prefer brewed stuff (e.g. python) over /usr/bin. + prepend 'PATH', HOMEBREW_PREFIX/'bin', ':' end def with_build_environment |