diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/bundler/resolver.rb | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/lib/bundler/resolver.rb b/lib/bundler/resolver.rb index 329540fd3d..30e9a7beaa 100644 --- a/lib/bundler/resolver.rb +++ b/lib/bundler/resolver.rb @@ -158,7 +158,13 @@ module Bundler def versions_for(package, range=VersionRange.any) versions = range.select_versions(@sorted_versions[package]) - sort_versions_by_preferred(package, versions) + # Conditional avoids (among other things) calling + # sort_versions_by_preferred with the root package + if versions.size > 1 + sort_versions_by_preferred(package, versions) + else + versions + end end def no_versions_incompatibility_for(package, unsatisfied_term) @@ -358,11 +364,7 @@ module Bundler end def sort_versions_by_preferred(package, versions) - if versions.size > 1 - @gem_version_promoter.sort_versions(package, versions) - else - versions - end + @gem_version_promoter.sort_versions(package, versions) end def repository_for(package) |