diff options
| author | Samuel E. Giddins <segiddins@segiddins.me> | 2015-07-26 22:16:01 -0700 |
|---|---|---|
| committer | Samuel E. Giddins <segiddins@segiddins.me> | 2015-07-26 22:16:01 -0700 |
| commit | 58ce165aa37d11f6fa8f9400684f68f907eece45 (patch) | |
| tree | 0275213dcd32f08cf9e660a3e53da3b6887d4ccc | |
| parent | 8be3be3247e067ee50769c3b0e281d09225650fa (diff) | |
| download | bundler-58ce165aa37d11f6fa8f9400684f68f907eece45.tar.gz | |
[Resolver] Tune conflict message wording
| -rw-r--r-- | lib/bundler/resolver.rb | 2 | ||||
| -rw-r--r-- | spec/install/bundler_spec.rb | 6 | ||||
| -rw-r--r-- | spec/install/gems/flex_spec.rb | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/lib/bundler/resolver.rb b/lib/bundler/resolver.rb index 7b0946ff9b..5874a95e55 100644 --- a/lib/bundler/resolver.rb +++ b/lib/bundler/resolver.rb @@ -19,7 +19,7 @@ module Bundler t << " " * depth << req.to_s unless tree.last == req if spec = conflict.activated_by_name[req.name] - t << %(, resolved to #{spec.version},) + t << %( was resolved to #{spec.version}, which) end t << %( depends on) end diff --git a/spec/install/bundler_spec.rb b/spec/install/bundler_spec.rb index bec405eced..567b8441e8 100644 --- a/spec/install/bundler_spec.rb +++ b/spec/install/bundler_spec.rb @@ -98,10 +98,10 @@ describe "bundle install" do Resolving dependencies... Bundler could not find compatible versions for gem "activesupport": In Gemfile: - activemerchant, resolved to 1.0, depends on + activemerchant was resolved to 1.0, which depends on activesupport (>= 2.0.0) - rails_fail, resolved to 1.0, depends on + rails_fail was resolved to 1.0, which depends on activesupport (= 1.2.3) E expect(out).to eq(nice_error) @@ -119,7 +119,7 @@ describe "bundle install" do Resolving dependencies... Bundler could not find compatible versions for gem "activesupport": In Gemfile: - rails_fail, resolved to 1.0, depends on + rails_fail was resolved to 1.0, which depends on activesupport (= 1.2.3) activesupport (= 2.3.5) diff --git a/spec/install/gems/flex_spec.rb b/spec/install/gems/flex_spec.rb index d2f9427513..4881d06180 100644 --- a/spec/install/gems/flex_spec.rb +++ b/spec/install/gems/flex_spec.rb @@ -200,10 +200,10 @@ describe "bundle flex_install" do rack (= 0.9.1) In Gemfile: - rack-obama (= 2.0), resolved to 2.0, depends on + rack-obama (= 2.0) was resolved to 2.0, which depends on rack (= 1.2) - rack_middleware, resolved to 1.0, depends on + rack_middleware was resolved to 1.0, which depends on rack (= 0.9.1) Running `bundle update` will rebuild your snapshot from scratch, using only |