diff options
| author | Andre Arko <andre@arko.net> | 2012-05-26 17:46:06 -0700 |
|---|---|---|
| committer | Andre Arko <andre@arko.net> | 2012-05-26 17:46:06 -0700 |
| commit | 9efbcdf5b94c007538e16d0f15c351248e722002 (patch) | |
| tree | 7c4b44f1b0253444f24bf79e949dac46c49ae5ee /lib | |
| parent | a18e76f9e945b986e80f8405e599bab2e9ad7d89 (diff) | |
| download | bundler-9efbcdf5b94c007538e16d0f15c351248e722002.tar.gz | |
Revert "return the right error code for bundle exec with ruby version"
This is based on the previously-reverted commit, so I'm reverting it as well for now.
This reverts commit 5ba208133c7c2293dfa096dcb8ccbe19f8d010f3.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/bundler/cli.rb | 2 | ||||
| -rw-r--r-- | lib/bundler/setup.rb | 6 |
2 files changed, 0 insertions, 8 deletions
diff --git a/lib/bundler/cli.rb b/lib/bundler/cli.rb index f49a9f4a44..c5f4fc7ad6 100644 --- a/lib/bundler/cli.rb +++ b/lib/bundler/cli.rb @@ -422,8 +422,6 @@ module Bundler Bundler.definition.validate_ruby! Bundler.load.setup_environment - ENV['BUNDLE_EXECING'] = options["no-color"] ? "no-color" : "color" - begin # Run Kernel.exec(*ARGV) diff --git a/lib/bundler/setup.rb b/lib/bundler/setup.rb index 31415bd070..d5770977d5 100644 --- a/lib/bundler/setup.rb +++ b/lib/bundler/setup.rb @@ -1,5 +1,4 @@ require 'bundler/shared_helpers' -require 'bundler/friendly_errors' if Bundler::SharedHelpers.in_bundle? require 'bundler' @@ -14,11 +13,6 @@ if Bundler::SharedHelpers.in_bundle? end exit e.status_code end - elsif ENV['BUNDLE_EXECING'] - require 'bundler/vendored_thor' - the_shell = (ENV['BUNDLE_EXECING'] == "no-color" ? Thor::Shell::Basic.new : Thor::Base.shell.new) - Bundler.ui = Bundler::UI::Shell.new(the_shell) - Bundler.with_friendly_errors {Bundler.setup } else Bundler.setup end |