From 4525cf2cd599389be3fab30ae4c13e22050705b5 Mon Sep 17 00:00:00 2001 From: hsbt Date: Thu, 21 Dec 2017 09:22:15 +0000 Subject: Merge release version of bundler-1.16.1 from upstream. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61388 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/bundler.gemspec | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'lib/bundler.gemspec') diff --git a/lib/bundler.gemspec b/lib/bundler.gemspec index fdc1a5cea9..227191b090 100644 --- a/lib/bundler.gemspec +++ b/lib/bundler.gemspec @@ -1,10 +1,9 @@ # coding: utf-8 # frozen_string_literal: true -version = File.expand_path("../lib/bundler/version", __FILE__) -if File.file?(version) - require version -else # for Ruby core repository +begin + require File.expand_path("../lib/bundler/version", __FILE__) +rescue LoadError # for Ruby core repository require File.expand_path("../bundler/version", __FILE__) end require "shellwords" -- cgit v1.2.3