aboutsummaryrefslogtreecommitdiffstats
path: root/lib/bundler/setup.rb
diff options
context:
space:
mode:
authorAndre Arko <andre@arko.net>2012-05-26 17:46:06 -0700
committerAndre Arko <andre@arko.net>2012-05-26 17:46:06 -0700
commit9efbcdf5b94c007538e16d0f15c351248e722002 (patch)
tree7c4b44f1b0253444f24bf79e949dac46c49ae5ee /lib/bundler/setup.rb
parenta18e76f9e945b986e80f8405e599bab2e9ad7d89 (diff)
downloadbundler-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/bundler/setup.rb')
-rw-r--r--lib/bundler/setup.rb6
1 files changed, 0 insertions, 6 deletions
diff --git a/lib/bundler/setup.rb b/lib/bundler/setup.rb
index 31415bd0..d5770977 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