summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/bundler/resolver.rb13
1 files changed, 11 insertions, 2 deletions
diff --git a/lib/bundler/resolver.rb b/lib/bundler/resolver.rb
index 56a6c7ac67..ce51056904 100644
--- a/lib/bundler/resolver.rb
+++ b/lib/bundler/resolver.rb
@@ -389,9 +389,18 @@ module Bundler
end
def filter_remote_specs(specs, package)
- return specs unless package.prefer_local?
+ if package.prefer_local?
+ local_specs = specs.select {|s| s.is_a?(StubSpecification) }
- specs.select {|s| s.is_a?(StubSpecification) }
+ if local_specs.empty?
+ package.consider_remote_versions!
+ specs
+ else
+ local_specs
+ end
+ else
+ specs
+ end
end
# Ignore versions that depend on themselves incorrectly