aboutsummaryrefslogtreecommitdiffstats
path: root/lib/bundler/installer.rb
diff options
context:
space:
mode:
authorCarlhuda <carlhuda@engineyard.com>2010-02-03 16:18:50 -0800
committerCarlhuda <carlhuda@engineyard.com>2010-02-03 16:18:50 -0800
commitecec2af4691ff3690995d659bdabc04d87c35368 (patch)
tree291cce5b56215a4cd9156e19609c661543e57227 /lib/bundler/installer.rb
parenteec57fbd360866323a63226b5d24efc9d94c3268 (diff)
downloadbundler-ecec2af4691ff3690995d659bdabc04d87c35368.tar.gz
Fix a bug with source pinning and dependencies
Diffstat (limited to 'lib/bundler/installer.rb')
-rw-r--r--lib/bundler/installer.rb8
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/bundler/installer.rb b/lib/bundler/installer.rb
index 37707fc1..b449202a 100644
--- a/lib/bundler/installer.rb
+++ b/lib/bundler/installer.rb
@@ -112,7 +112,11 @@ module Bundler
def index
@index ||= begin
- index = local_index
+ index = Index.new
+
+ if File.directory?("#{root}/vendor/cache")
+ index = cache_source.specs.merge(index).freeze
+ end
sources.each do |source|
i = source.specs
@@ -121,7 +125,7 @@ module Bundler
Bundler.ui.debug "Done."
end
- index
+ Index.from_installed_gems.merge(index)
end
end