summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/bundler/resolver.rb2
-rw-r--r--spec/install/gems/resolving_spec.rb8
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/bundler/resolver.rb b/lib/bundler/resolver.rb
index 8b029cc0dc..61bb648598 100644
--- a/lib/bundler/resolver.rb
+++ b/lib/bundler/resolver.rb
@@ -75,7 +75,7 @@ module Bundler
return unless debug?
debug_info = yield
debug_info = debug_info.inspect unless debug_info.is_a?(String)
- warn debug_info.split("\n").map {|s| " " * depth + s }
+ warn debug_info.split("\n").map {|s| "BUNDLER: " + " " * depth + s }
end
def debug?
diff --git a/spec/install/gems/resolving_spec.rb b/spec/install/gems/resolving_spec.rb
index e55e91f126..315d615604 100644
--- a/spec/install/gems/resolving_spec.rb
+++ b/spec/install/gems/resolving_spec.rb
@@ -79,7 +79,7 @@ RSpec.describe "bundle install with install-time dependencies" do
bundle :install, :env => { "BUNDLER_DEBUG_RESOLVER" => "1" }
- expect(err).to include("Creating possibility state for net_c")
+ expect(err).to include("BUNDLER: Starting resolution")
end
end
@@ -93,7 +93,7 @@ RSpec.describe "bundle install with install-time dependencies" do
bundle :install, :env => { "DEBUG_RESOLVER" => "1" }
- expect(err).to include("Creating possibility state for net_c")
+ expect(err).to include("BUNDLER: Starting resolution")
end
end
@@ -108,8 +108,8 @@ RSpec.describe "bundle install with install-time dependencies" do
bundle :install, :env => { "DEBUG_RESOLVER_TREE" => "1" }
expect(err).to include(" net_b").
- and include("Starting resolution").
- and include("Finished resolution").
+ and include("BUNDLER: Starting resolution").
+ and include("BUNDLER: Finished resolution").
and include("Attempting to activate")
end
end