Auto merge of #4524 - grzuy:fix_frozen_string, r=segiddins

Fixes frozen string exception when checking equivalent gemfile and lockfile closes #4520
rubygems · May 4, 2016 · 4c9d42a · 4c9d42a
1 parent f935e2f
commit 4c9d42a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb
@@ -428,7 +428,7 @@ def nothing_changed?
     end
 
     def pretty_dep(dep, source = false)
-      msg = "#{dep.name}"
+      msg = String.new(dep.name)
       msg << " (#{dep.requirement})" unless dep.requirement == Gem::Requirement.default
       msg << " from the `#{dep.source}` source" if source && dep.source
       msg

diff --git a/spec/install/deploy_spec.rb b/spec/install/deploy_spec.rb
@@ -172,13 +172,13 @@
       gemfile <<-G
         source "file://#{gem_repo1}"
         gem "rack"
-        gem "rack-obama"
+        gem "rack-obama", "1.1"
       G
 
       bundle "install --frozen"
       expect(out).to include("deployment mode")
       expect(out).to include("You have added to the Gemfile")
-      expect(out).to include("* rack-obama")
+      expect(out).to include("* rack-obama (= 1.1)")
       expect(out).not_to include("You have deleted from the Gemfile")
       expect(out).not_to include("You have changed in the Gemfile")
     end