From 2aa84b2372371c4895cab4e096b48a34f88c451a Mon Sep 17 00:00:00 2001 From: SHIBATA Hiroshi Date: Wed, 7 Nov 2018 16:10:15 +0000 Subject: Revert File.file? conditioon on gemspec, Because it break spec/runtime/setup_spec.rb:896 --- bundler.gemspec | 8 ++++---- 1 file 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" -- cgit v1.2.1