From 4dac954cdb811f2caabbea397e4f4fe4eb714a25 Mon Sep 17 00:00:00 2001 From: Samuel John Date: Tue, 4 Jun 2013 22:33:24 +0200 Subject: 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. --- Library/Homebrew/extend/ENV.rb | 2 ++ 1 file changed, 2 insertions(+) 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 -- cgit v1.2.3