aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/gem_dependency.rb
diff options
context:
space:
mode:
authorJ.D. Hollis <jd@densityofspace.com>2009-06-30 08:58:35 -0400
committerYehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>2009-07-02 10:27:54 -0700
commit9eab435631e1b0a659126d068972ee88cff160de (patch)
tree70627d2c8d6896daa590b10022eb30a445140e61 /railties/lib/rails/gem_dependency.rb
parent8bb510f6c1e235f5fb1cf9e79af759a429a497b0 (diff)
downloadrails-9eab435631e1b0a659126d068972ee88cff160de.tar.gz
rails-9eab435631e1b0a659126d068972ee88cff160de.tar.bz2
rails-9eab435631e1b0a659126d068972ee88cff160de.zip
Only check for built extensions on gem dependencies that are in vendor/gems. [#2825 state:resolved]
Signed-off-by: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
Diffstat (limited to 'railties/lib/rails/gem_dependency.rb')
-rw-r--r--railties/lib/rails/gem_dependency.rb10
1 files changed, 7 insertions, 3 deletions
diff --git a/railties/lib/rails/gem_dependency.rb b/railties/lib/rails/gem_dependency.rb
index 3cc75494e4..06d830ba24 100644
--- a/railties/lib/rails/gem_dependency.rb
+++ b/railties/lib/rails/gem_dependency.rb
@@ -122,10 +122,14 @@ module Rails
def built?
return false unless frozen?
- specification.extensions.each do |ext|
- makefile = File.join(unpacked_gem_directory, File.dirname(ext), 'Makefile')
- return false unless File.exists?(makefile)
+
+ if vendor_gem?
+ specification.extensions.each do |ext|
+ makefile = File.join(unpacked_gem_directory, File.dirname(ext), 'Makefile')
+ return false unless File.exists?(makefile)
+ end
end
+
true
end