diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-08-24 15:28:23 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-08-24 15:28:23 +0000 |
| commit | 996b1bfa95347e5171c3f7ab32b6740656ed7a8b (patch) | |
| tree | be0310be446bf313f16a12a3a3b56c30b4900cbd /lib/rubygems/exceptions.rb | |
| parent | ce8729feb61d507805d965c5479f343e3701c659 (diff) | |
merge revision(s) 53707,53708,53709,53712,53777,53781: [Backport #12326]
* lib/rubygems.rb, lib/rubygems/*, test/rubygems/*: Update rubygems-2.5.2.
It supports to enable frozen string literal and add `--norc` option for
disable to `.gemrc` configuration.
See 2.5.2 release notes for other fixes and enhancements.
https://github.com/rubygems/rubygems/blob/a8aa3bac723f045c52471c7b9328310a048561e0/History.txt#L3
* lib/rubygems/specification.rb: `coding` is affect only first line except
shebang.
* lib/rubygems/package.rb, lib/rubygems/package/*: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@56003 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems/exceptions.rb')
| -rw-r--r-- | lib/rubygems/exceptions.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/rubygems/exceptions.rb b/lib/rubygems/exceptions.rb index 0c741a2d01..9089eae4d5 100644 --- a/lib/rubygems/exceptions.rb +++ b/lib/rubygems/exceptions.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true # TODO: the documentation in here is terrible. # # Each exception needs a brief description and the scenarios where it is @@ -138,7 +138,7 @@ class Gem::ImpossibleDependenciesError < Gem::Exception requester = requester ? requester.spec.full_name : 'The user' dependency = @request.dependency - message = "#{requester} requires #{dependency} but it conflicted:\n" + message = "#{requester} requires #{dependency} but it conflicted:\n".dup @conflicts.each do |_, conflict| message << conflict.explanation @@ -268,4 +268,3 @@ end # Backwards compatible typo'd exception class for early RubyGems 2.0.x Gem::UnsatisfiableDepedencyError = Gem::UnsatisfiableDependencyError # :nodoc: - |