aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-09-08 08:50:57 +0000
committerhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-09-08 08:50:57 +0000
commitf8545265650328820e6405724371bc7b3781f2cd (patch)
tree193e0711b1e189b72f1a7e2a733e66c9e2db2033
parent84597f986329e8ba2790afb64a613aef2df43204 (diff)
downloadruby-f8545265650328820e6405724371bc7b3781f2cd.tar.gz
Rollback to v1.15.4 version.
In r59779, it contains current master version of bundler repository. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59781 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rwxr-xr-xbin/bundle_ruby7
1 files changed, 3 insertions, 4 deletions
diff --git a/bin/bundle_ruby b/bin/bundle_ruby
index df6f8cc8a1..847708c3ea 100755
--- a/bin/bundle_ruby
+++ b/bin/bundle_ruby
@@ -1,15 +1,12 @@
#!/usr/bin/env ruby
# frozen_string_literal: true
-require "bundler/shared_helpers"
-
-Bundler::SharedHelpers.major_deprecation(2, "the bundle_ruby executable has been removed in favor of `bundle platform --ruby`")
-
Signal.trap("INT") { exit 1 }
require "bundler/errors"
require "bundler/ruby_version"
require "bundler/ruby_dsl"
+require "bundler/shared_helpers"
module Bundler
class Dsl
@@ -45,6 +42,8 @@ module Bundler
end
end
+Bundler::SharedHelpers.major_deprecation("the bundle_ruby executable has been removed in favor of `bundle platform --ruby`")
+
dsl = Bundler::Dsl.new
begin
dsl.eval_gemfile(Bundler::SharedHelpers.default_gemfile)