summaryrefslogtreecommitdiff
path: root/lib/bundler/resolver
diff options
context:
space:
mode:
authorDavid Rodríguez <deivid.rodriguez@riseup.net>2023-10-04 20:08:49 +0200
committerHiroshi SHIBATA <hsbt@ruby-lang.org>2023-10-16 13:52:57 +0900
commit77ffa1a7c3af797078b2a8e84bfc6f2b0ba67820 (patch)
treeb0c00647d046bb56d3c9ead6e73493a71b6708b1 /lib/bundler/resolver
parent73ba4b76c20931ad5c786de3ae3ad92523bc1443 (diff)
[rubygems/rubygems] Raise an error when top level dependency does not resolve under all locked platforms
https://github.com/rubygems/rubygems/commit/25304f3e8d
Diffstat (limited to 'lib/bundler/resolver')
-rw-r--r--lib/bundler/resolver/package.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/bundler/resolver/package.rb b/lib/bundler/resolver/package.rb
index 7499a75006..0461328683 100644
--- a/lib/bundler/resolver/package.rb
+++ b/lib/bundler/resolver/package.rb
@@ -21,6 +21,7 @@ module Bundler
@locked_version = locked_specs[name].first&.version
@unlock = unlock
@dependency = dependency || Dependency.new(name, @locked_version)
+ @top_level = !dependency.nil?
@prerelease = @dependency.prerelease? || @locked_version&.prerelease? || prerelease ? :consider_first : :ignore
end
@@ -32,6 +33,10 @@ module Bundler
false
end
+ def top_level?
+ @top_level
+ end
+
def meta?
@name.end_with?("\0")
end