summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Giddins <segiddins@segiddins.me>2017-06-23 13:04:17 -0500
committerSamuel Giddins <segiddins@segiddins.me>2017-06-23 13:37:43 -0500
commit717d1946c46907af3b303d859a20403e253d0224 (patch)
tree89b9297d603b237f8270c45140807f680b64346f
parent217ecd51afd5aac697b502ef68ada30e6ab2068a (diff)
downloadbundler-seg-bundler-2-specs.tar.gz
[Definition] Avoid a group_by when not running a new resolveseg-bundler-2-specs
-rw-r--r--lib/bundler/definition.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb
index 0819bb91c5..01df860d6e 100644
--- a/lib/bundler/definition.rb
+++ b/lib/bundler/definition.rb
@@ -54,8 +54,7 @@ module Bundler
def initialize(lockfile, dependencies, sources, unlock, ruby_version = nil, optional_groups = [])
@unlocking = unlock == true || !unlock.empty?
- @dependencies = dependencies
- @dependencies_by_name = dependencies.group_by(&:name)
+ @dependencies = dependencies
@sources = sources
@unlock = unlock
@optional_groups = optional_groups
@@ -953,9 +952,10 @@ module Bundler
def additional_base_requirements_for_resolve
return [] unless @locked_gems && Bundler.feature_flag.only_update_to_newer_versions?
+ dependencies_by_name = dependencies.group_by(&:name)
@locked_gems.specs.reduce({}) do |requirements, locked_spec|
name = locked_spec.name
- next requirements if @locked_deps[name] != @dependencies_by_name[name]
+ next requirements if @locked_deps[name] != dependencies_by_name[name]
dep = Gem::Dependency.new(name, ">= #{locked_spec.version}")
requirements[name] = DepProxy.new(dep, locked_spec.platform)
requirements