summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHiroshi SHIBATA <hsbt@ruby-lang.org>2024-09-09 19:06:33 +0900
committergit <svn-admin@ruby-lang.org>2024-09-10 02:50:48 +0000
commita5d658cb7a6ecedc5eadf6709ea31bf5cf0229be (patch)
treee39dba7fb5b639c7fded135e969ab90c993c9691
parent3725c388f8654c789c87c0b9633c99241679bf9a (diff)
[rubygems/rubygems] Removed duplicated dependencies that used by bundler inline
https://github.com/rubygems/rubygems/commit/d46b6a49af
-rw-r--r--lib/bundler/inline.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/bundler/inline.rb b/lib/bundler/inline.rb
index 238e650d65..1b12de1d7c 100644
--- a/lib/bundler/inline.rb
+++ b/lib/bundler/inline.rb
@@ -71,6 +71,7 @@ def gemfile(install = false, options = {}, &gemfile)
"The #{name} gem was resolved to #{version}, but #{activated_version} was activated by Bundler while installing it, causing a conflict. " \
"Bundler will now retry resolving with #{activated_version} instead."
+ builder.dependencies.delete_if {|d| d.name == name }
builder.instance_eval { gem name, activated_version }
definition = builder.to_definition(nil, true)