summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorSamuel Giddins <segiddins@segiddins.me>2017-04-13 20:32:50 -0500
committerSamuel Giddins <segiddins@segiddins.me>2017-04-14 19:24:48 -0500
commitf4db3824390e0ea626c5d9a2d08659296f609edf (patch)
tree609282176b2eaa67984b8c6f42908f612ed4317e /lib
parent3b62843d99648b803c0210a09b54db36dbf5e1ab (diff)
downloadbundler-f4db3824390e0ea626c5d9a2d08659296f609edf.tar.gz
[Definition] Avoid checking settings in a loop
Diffstat (limited to 'lib')
-rw-r--r--lib/bundler/definition.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb
index 6d3ad4f63a..3e5b1bc447 100644
--- a/lib/bundler/definition.rb
+++ b/lib/bundler/definition.rb
@@ -669,11 +669,12 @@ module Bundler
end
def converge_dependencies
+ frozen = Bundler.settings[:frozen]
(@dependencies + @locked_deps.values).each do |dep|
locked_source = @locked_deps[dep.name]
# This is to make sure that if bundler is installing in deployment mode and
# after locked_source and sources don't match, we still use locked_source.
- if Bundler.settings[:frozen] && !locked_source.nil? &&
+ if frozen && !locked_source.nil? &&
locked_source.respond_to?(:source) && locked_source.source.instance_of?(Source::Path) && locked_source.source.path.exist?
dep.source = locked_source.source
elsif dep.source