summaryrefslogtreecommitdiff
path: root/lib/bundler.gemspec
diff options
context:
space:
mode:
authorhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-12-21 09:22:15 +0000
committerhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-12-21 09:22:15 +0000
commit4525cf2cd599389be3fab30ae4c13e22050705b5 (patch)
tree33165c2a9ec72863caa8c476e380e36eeb9c6a69 /lib/bundler.gemspec
parent85277d5be0b24638ea4bf84c422e71a1219465e7 (diff)
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
Diffstat (limited to 'lib/bundler.gemspec')
-rw-r--r--lib/bundler.gemspec7
1 files changed, 3 insertions, 4 deletions
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"