summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Arko <andre@arko.net>2015-06-23 21:49:15 -0700
committerAndre Arko <andre@arko.net>2015-06-23 21:49:15 -0700
commit3b7045a285a03fb6e36704b988304ee089b12d0a (patch)
tree94218bd5be6fb1fc53c4c737ba17721b16504f81
parent13c445680f65293ee50f11718e8a86bfa87abd2e (diff)
downloadbundler-3b7045a285a03fb6e36704b988304ee089b12d0a.tar.gz
try to make the precedence clearer
-rw-r--r--lib/bundler/source/rubygems.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/bundler/source/rubygems.rb b/lib/bundler/source/rubygems.rb
index bb06830f3e..a7a826d3f9 100644
--- a/lib/bundler/source/rubygems.rb
+++ b/lib/bundler/source/rubygems.rb
@@ -98,7 +98,7 @@ module Bundler
end
end
- if (installed_specs[spec].any? && !force) || bundler?(spec)
+ if installed?(spec) && (!force || spec.name.eql?("bundler"))
Bundler.ui.info "Using #{version_message(spec)}"
return nil # no post-install message
end
@@ -413,8 +413,8 @@ module Bundler
spec.loaded_from && spec.loaded_from.include?("specifications/default/")
end
- def bundler?(spec)
- spec.name.eql?('bundler')
+ def installed?(spec)
+ installed_specs[spec].any?
end
end