diff options
author | Homu <homu@barosl.com> | 2016-09-17 23:50:35 +0900 |
---|---|---|
committer | Homu <homu@barosl.com> | 2016-09-17 23:50:35 +0900 |
commit | 0f83e5ad25830db99d2b027e88843199a6f6e445 (patch) | |
tree | 2317e64b0dc6e58608e2dafb8416a09279aad682 | |
parent | 178c7de33f0ece30bbfd5f7688ed310380755186 (diff) | |
parent | d57220b5a3ee778c01a3362015426bc1f79a95d1 (diff) | |
download | bundler-0f83e5ad25830db99d2b027e88843199a6f6e445.tar.gz |
Auto merge of #4994 - bundler:seg-definition-init-perf, r=segiddins
[Definition] Avoid parsing lockfile twice on init
\c @chrismo
-rw-r--r-- | lib/bundler/definition.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb index 8bd60168c7..12951cdf9c 100644 --- a/lib/bundler/definition.rb +++ b/lib/bundler/definition.rb @@ -135,17 +135,15 @@ module Bundler end def create_gem_version_promoter - locked_specs = begin + locked_specs = if @unlocking && @locked_specs.empty? && !@lockfile_contents.empty? # Definition uses an empty set of locked_specs to indicate all gems # are unlocked, but GemVersionPromoter needs the locked_specs # for conservative comparison. - locked = Bundler::LockfileParser.new(@lockfile_contents) - Bundler::SpecSet.new(locked.specs) + Bundler::SpecSet.new(@locked_gems.specs) else @locked_specs end - end GemVersionPromoter.new(locked_specs, @unlock[:gems]) end |