diff options
| author | David RodrÃguez <[email protected]> | 2025-06-03 17:40:16 +0200 |
|---|---|---|
| committer | Hiroshi SHIBATA <[email protected]> | 2025-06-05 19:12:46 +0900 |
| commit | b9e3edb3e60c3efb97a0e7df2da9d2be1cf71d02 (patch) | |
| tree | 1d29d97f0d2baf3e6c5dd93b0998e3190ac7210f | |
| parent | 970eac1530081e4d56614b4c865fe1c5aae9532b (diff) | |
[rubygems/rubygems] Slightly simplify locked specification source replacement
https://github.com/rubygems/rubygems/commit/22f0a07377
| -rw-r--r-- | lib/bundler/definition.rb | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb index 1a3cf9d6db..82e5b713f0 100644 --- a/lib/bundler/definition.rb +++ b/lib/bundler/definition.rb @@ -1037,17 +1037,16 @@ module Bundler lockfile_source = s.source if dep - gemfile_source = dep.source || default_source + replacement_source = dep.source - deps << dep if !dep.source || lockfile_source.include?(dep.source) || new_deps.include?(dep) - - # Replace the locked dependency's source with the equivalent source from the Gemfile - s.source = gemfile_source + deps << dep if !replacement_source || lockfile_source.include?(replacement_source) || new_deps.include?(dep) else - # Replace the locked dependency's source with the default source, if the locked source is no longer in the Gemfile - s.source = sources.get(lockfile_source) || default_source + replacement_source = sources.get(lockfile_source) end + # Replace the locked dependency's source with the equivalent source from the Gemfile + s.source = replacement_source || default_source + source = s.source next if @sources_to_unlock.include?(source.name) |