diff options
| author | Samuel Giddins <segiddins@segiddins.me> | 2016-04-15 19:46:14 -0500 |
|---|---|---|
| committer | Samuel Giddins <segiddins@segiddins.me> | 2016-06-04 23:53:37 -0500 |
| commit | 388febddd67945ed09cf5fcd30d1b9bfed2bda50 (patch) | |
| tree | 0976400c34a6f5678b8ed2a2f6c30800939a3582 /lib/bundler/index.rb | |
| parent | 667d4e4487bde5196bb326a7c03531e65de85cf6 (diff) | |
| download | bundler-388febddd67945ed09cf5fcd30d1b9bfed2bda50.tar.gz | |
gemspec allow conflicts
Diffstat (limited to 'lib/bundler/index.rb')
| -rw-r--r-- | lib/bundler/index.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/bundler/index.rb b/lib/bundler/index.rb index 5c49034280..a03c11d992 100644 --- a/lib/bundler/index.rb +++ b/lib/bundler/index.rb @@ -156,6 +156,7 @@ module Bundler @cache[base || false][dependency] ||= begin specs = specs_by_name(dependency.name) + (base || []) found = specs.select do |spec| + next true if spec.source.is_a?(Source::Gemspec) if base # allow all platforms when searching from a lockfile dependency.matches_spec?(spec) else |