diff options
author | Samuel Giddins <segiddins@segiddins.me> | 2016-10-19 12:17:37 -0500 |
---|---|---|
committer | Samuel Giddins <segiddins@segiddins.me> | 2017-01-14 19:10:36 -0600 |
commit | a65e81d938e014fcb1c9176f24af4b5d0881b91e (patch) | |
tree | 68e41ac8b9ef0987121ceb073ff555b9a5aafd46 /lib/bundler/resolver.rb | |
parent | 3f0075896a60ba1771913fc1118ecc9b91db98bb (diff) | |
download | bundler-a65e81d938e014fcb1c9176f24af4b5d0881b91e.tar.gz |
[Resolver] Consider locked dependencies first
Diffstat (limited to 'lib/bundler/resolver.rb')
-rw-r--r-- | lib/bundler/resolver.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/bundler/resolver.rb b/lib/bundler/resolver.rb index bdb8f4883c..2eff76d7ff 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, |