summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHomu <homu@barosl.com>2016-09-17 23:50:35 +0900
committerSamuel Giddins <segiddins@segiddins.me>2016-09-30 12:27:07 -0500
commitaeb283f95f99a429b8b04cba997615b0140320fc (patch)
tree4cc59ef88c9510bc9877f827dd006b1b04dbd010
parent7c2592ef5cbd2c21f335c3f8070c402fd6b54152 (diff)
downloadbundler-aeb283f95f99a429b8b04cba997615b0140320fc.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.rb6
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb
index 2d328e0de1..05d4c4cddb 100644
--- a/lib/bundler/definition.rb
+++ b/lib/bundler/definition.rb
@@ -137,17 +137,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