From a65e81d938e014fcb1c9176f24af4b5d0881b91e Mon Sep 17 00:00:00 2001 From: Samuel Giddins Date: Wed, 19 Oct 2016 12:17:37 -0500 Subject: [Resolver] Consider locked dependencies first --- lib/bundler/resolver.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/bundler/resolver.rb b/lib/bundler/resolver.rb index bdb8f488..2eff76d7 100644 --- a/lib/bundler/resolver.rb +++ b/lib/bundler/resolver.rb @@ -14,7 +14,7 @@ module Bundler def message conflicts.sort.reduce(String.new) do |o, (name, conflict)| - o << %(Bundler could not find compatible versions for gem "#{name}":\n) + o << %(\nBundler could not find compatible versions for gem "#{name}":\n) if conflict.locked_requirement o << %( In snapshot (#{Bundler.default_lockfile.basename}):\n) o << %( #{printable_dep(conflict.locked_requirement)}\n) @@ -62,7 +62,7 @@ module Bundler end end o - end + end.strip end end @@ -315,6 +315,7 @@ module Bundler dependencies.sort_by do |dependency| name = name_for(dependency) [ + @base_dg.vertex_named(name) ? 0 : 1, activated.vertex_named(name).payload ? 0 : 1, amount_constrained(dependency), conflicts[name] ? 0 : 1, -- cgit v1.2.3