aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Rodríguez <deivid.rodriguez@riseup.net>2022-12-13 16:31:13 +0100
committerHiroshi SHIBATA <hsbt@ruby-lang.org>2022-12-20 13:15:02 +0900
commitd1c210355b0c27fa5846cd0fd0c55358a7d5a0e0 (patch)
treeb22b93a91cc06ac695d9e7866d0e1d6155f82685
parentfe3dedb21a945063724502e96c21ed3682c61c18 (diff)
downloadruby-d1c210355b0c27fa5846cd0fd0c55358a7d5a0e0.tar.gz
[rubygems/rubygems] Extract a variable for consistency
https://github.com/rubygems/rubygems/commit/3f4b1c7a01
-rw-r--r--lib/bundler/resolver.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/bundler/resolver.rb b/lib/bundler/resolver.rb
index c175ea4354..eaf0506c97 100644
--- a/lib/bundler/resolver.rb
+++ b/lib/bundler/resolver.rb
@@ -191,12 +191,13 @@ module Bundler
self_constraint = PubGrub::VersionConstraint.new(package, :range => range)
dep_term = PubGrub::Term.new(dep_constraint, false)
+ self_term = PubGrub::Term.new(self_constraint, true)
custom_explanation = if dep_package.meta? && package.root?
"current #{dep_package} version is #{dep_constraint.constraint_string}"
end
- PubGrub::Incompatibility.new([PubGrub::Term.new(self_constraint, true), dep_term], :cause => :dependency, :custom_explanation => custom_explanation)
+ PubGrub::Incompatibility.new([self_term, dep_term], :cause => :dependency, :custom_explanation => custom_explanation)
end
end