Skip to content

Commit

Permalink
Revert "Merge pull request rubygems#1364 from tpope/bundler"
Browse files Browse the repository at this point in the history
This reverts commit 93942d7, reversing
changes made to 8cf9a6d.

Loading gem plugins can cause bundle install to fail.

Conflicts:

	lib/bundler/cli.rb
  • Loading branch information
hone committed Nov 18, 2011
1 parent 63e27f0 commit 4195f48
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions lib/bundler/cli.rb
Original file line number Diff line number Diff line change
Expand Up @@ -213,8 +213,6 @@ def install
Bundler.ui.be_quiet! if opts[:quiet]

Bundler::Fetcher.disable_endpoint = opts["full-index"]
# rubygems plugins sometimes hook into the gem install process
Gem.load_plugins if Gem.respond_to?(:load_plugins)

Installer.install(Bundler.root, Bundler.definition, opts)
Bundler.load.cache if Bundler.root.join("vendor/cache").exist? && !options["no-cache"]
Expand Down Expand Up @@ -266,9 +264,6 @@ def update(*gems)
end

opts = {"update" => true, "local" => options[:local]}
# rubygems plugins sometimes hook into the gem install process
Gem.load_plugins if Gem.respond_to?(:load_plugins)

Installer.install Bundler.root, Bundler.definition, opts
Bundler.load.cache if Bundler.root.join("vendor/cache").exist?
clean if options["clean"] && Bundler.settings[:path]
Expand Down

0 comments on commit 4195f48

Please sign in to comment.