diff options
| author | Homu <homu@barosl.com> | 2015-11-27 15:12:00 +0900 |
|---|---|---|
| committer | Homu <homu@barosl.com> | 2015-11-27 15:12:00 +0900 |
| commit | 437f604956e629e1b96270d87f6fdb05b189de2d (patch) | |
| tree | e01f1583c45652499610c07a95a28a5b869980f1 /lib/bundler/runtime.rb | |
| parent | 50731b93d77fc8b4155d11306afb51d5e9534060 (diff) | |
| parent | 046f2831c1518519c47b8b5be97c1ed8aef4e58c (diff) | |
| download | bundler-437f604956e629e1b96270d87f6fdb05b189de2d.tar.gz | |
Auto merge of #4124 - bundler:seg-rubocop, r=indirect
More rubocop_todo cleanup
Diffstat (limited to 'lib/bundler/runtime.rb')
| -rw-r--r-- | lib/bundler/runtime.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/bundler/runtime.rb b/lib/bundler/runtime.rb index 179ce53ec4..63e345b04b 100644 --- a/lib/bundler/runtime.rb +++ b/lib/bundler/runtime.rb @@ -21,7 +21,7 @@ module Bundler raise GemNotFound, "#{spec.full_name} is missing. Run `bundle` to get it." end - if activated_spec = Bundler.rubygems.loaded_specs(spec.name) and activated_spec.version != spec.version + if (activated_spec = Bundler.rubygems.loaded_specs(spec.name)) && activated_spec.version != spec.version e = Gem::LoadError.new "You have already activated #{activated_spec.name} #{activated_spec.version}, " \ "but your Gemfile requires #{spec.name} #{spec.version}. Prepending " \ "`bundle exec` to your command may solve this." |