summaryrefslogtreecommitdiff
path: root/lib/bundler/definition.rb
diff options
context:
space:
mode:
authorSamuel Giddins <segiddins@segiddins.me>2018-11-05 22:33:28 -0800
committerSamuel Giddins <segiddins@segiddins.me>2018-11-17 15:31:01 -0600
commitfdb3a609adca1acfc9e1d0ed178cc70dbd6d9c60 (patch)
tree58537db6ca082779bb82e8020d01d32813dff69c /lib/bundler/definition.rb
parent8197732a3dd9df3071cf61ba4644ea826160fe05 (diff)
downloadbundler-fdb3a609adca1acfc9e1d0ed178cc70dbd6d9c60.tar.gz
[Definition] Dont pin path deps to newer versionssegiddins/6750-allow-changing-local-gem-version
Diffstat (limited to 'lib/bundler/definition.rb')
-rw-r--r--lib/bundler/definition.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb
index ffcc7ff326..9d6fbfff59 100644
--- a/lib/bundler/definition.rb
+++ b/lib/bundler/definition.rb
@@ -977,7 +977,9 @@ module Bundler
dependencies_by_name = dependencies.inject({}) {|memo, dep| memo.update(dep.name => dep) }
@locked_gems.specs.reduce({}) do |requirements, locked_spec|
name = locked_spec.name
- next requirements if @locked_gems.dependencies[name] != dependencies_by_name[name]
+ dependency = dependencies_by_name[name]
+ next requirements if @locked_gems.dependencies[name] != dependency
+ next requirements if dependency && dependency.source.is_a?(Source::Path)
dep = Gem::Dependency.new(name, ">= #{locked_spec.version}")
requirements[name] = DepProxy.new(dep, locked_spec.platform)
requirements