diff options
author | SHIBATA Hiroshi <hsbt@ruby-lang.org> | 2018-11-07 16:10:15 +0000 |
---|---|---|
committer | SHIBATA Hiroshi <hsbt@ruby-lang.org> | 2018-11-07 16:10:15 +0000 |
commit | 2aa84b2372371c4895cab4e096b48a34f88c451a (patch) | |
tree | 9320bf5592f06065fdfa1b1d91ac8c82ce9fa441 /bundler.gemspec | |
parent | 79307d4aba2beb04045d3c84722f0f0498339d25 (diff) | |
download | bundler-2aa84b2372371c4895cab4e096b48a34f88c451a.tar.gz |
Revert File.file? conditioon on gemspec, Because it break spec/runtime/setup_spec.rb:896support-structure-of-ruby-core
Diffstat (limited to 'bundler.gemspec')
-rw-r--r-- | bundler.gemspec | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bundler.gemspec b/bundler.gemspec index b7123077d9..c004de0965 100644 --- a/bundler.gemspec +++ b/bundler.gemspec @@ -1,11 +1,11 @@ # coding: utf-8 # frozen_string_literal: true -if File.file?(File.expand_path("../lib/bundler/version.rb", __FILE__)) - require File.expand_path("../lib/bundler/version.rb", __FILE__) -else +begin + require File.expand_path("../lib/bundler/version", __FILE__) +rescue LoadError # for Ruby core repository - require File.expand_path("../bundler/version.rb", __FILE__) + require File.expand_path("../bundler/version", __FILE__) end require "shellwords" |