summaryrefslogtreecommitdiff
path: root/lib/rubygems/resolver/lock_set.rb
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-08-24 15:28:23 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-08-24 15:28:23 +0000
commit996b1bfa95347e5171c3f7ab32b6740656ed7a8b (patch)
treebe0310be446bf313f16a12a3a3b56c30b4900cbd /lib/rubygems/resolver/lock_set.rb
parentce8729feb61d507805d965c5479f343e3701c659 (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/resolver/lock_set.rb')
-rw-r--r--lib/rubygems/resolver/lock_set.rb10
1 files changed, 4 insertions, 6 deletions
diff --git a/lib/rubygems/resolver/lock_set.rb b/lib/rubygems/resolver/lock_set.rb
index fb581a1508..7fddc93e1c 100644
--- a/lib/rubygems/resolver/lock_set.rb
+++ b/lib/rubygems/resolver/lock_set.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
##
# A set of gems from a gem dependencies lockfile.
@@ -28,11 +28,9 @@ class Gem::Resolver::LockSet < Gem::Resolver::Set
def add name, version, platform # :nodoc:
version = Gem::Version.new version
-
- specs = @sources.map do |source|
- Gem::Resolver::LockSpecification.new self, name, version, source,
- platform
- end
+ specs = [
+ Gem::Resolver::LockSpecification.new(self, name, version, @sources, platform)
+ ]
@specs.concat specs