No longer call ENV.userpaths! in requirements

Instead we use which with a custom PATH.
krono · Aug 19, 2013 · e1b6ebb · e1b6ebb
1 parent a1ce0db
commit e1b6ebb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/Library/Homebrew/requirement.rb b/Library/Homebrew/requirement.rb
@@ -94,6 +94,10 @@ def infer_env_modification(o)
     end
   end
 
+  def which(cmd)
+    super(cmd, ORIGINAL_PATHS.join(File::PATH_SEPARATOR))
+  end
+
   class << self
     attr_rw :fatal, :build, :default_formula
 
@@ -118,10 +122,7 @@ def yielder
       if instance_variable_defined?(:@satisfied)
         @satisfied
       elsif @options[:build_env]
-        ENV.with_build_environment do
-          ENV.userpaths!
-          yield @proc
-        end
+        ENV.with_build_environment { yield @proc }
       else
         yield @proc
       end

diff --git a/Library/Homebrew/test/test_requirement.rb b/Library/Homebrew/test/test_requirement.rb
@@ -50,12 +50,10 @@ def test_satisfy_with_boolean
 
   def test_satisfy_sets_up_build_env_by_default
     req = Class.new(Requirement) do
-      env :userpaths
       satisfy { true }
     end.new
 
     ENV.expects(:with_build_environment).yields.returns(true)
-    ENV.expects(:userpaths!)
 
     assert req.satisfied?
   end
@@ -66,7 +64,6 @@ def test_satisfy_build_env_can_be_disabled
     end.new
 
     ENV.expects(:with_build_environment).never
-    ENV.expects(:userpaths!).never
 
     assert req.satisfied?
   end
@@ -78,7 +75,6 @@ def test_infers_path_from_satisfy_result
     end.new
 
     ENV.expects(:with_build_environment).yields.returns(which_path)
-    ENV.expects(:userpaths!)
     ENV.expects(:append).with("PATH", which_path.parent, ":")
 
     req.satisfied?