github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-23 22:27:21 -04:00
Code Issues Projects Releases Packages Wiki Activity

Don't try to load bundler/cli anymore since we don't use it

Browse source 
This should help incorrectly installing bundler when it isn't present.

Fixes #1940
This commit is contained in:
Jordan Sissel 2014-10-22 19:29:05 +00:00
parent 920a9e9362
commit 27a4fe9553
2 changed files with 3 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
rakelib/dependency.rake
View file

@ -1,15 +1,8 @@
namespace "dependency" do
task "bundler" do
begin
# Special handling because "gem 'bundler', '>=1.3.5'" will fail if
# bundler is already loaded.
require "bundler/cli"
rescue LoadError
Rake::Task["gem:require"].invoke("bundler", ">= 1.3.5", ENV["GEM_HOME"])
require "bundler/cli"
end
require_relative "bundler_patch"
Rake::Task["gem:require"].invoke("bundler", ">= 1.3.5", ENV["GEM_HOME"])
#require_relative "bundler_patch"
end
task "rbx-stdlib" do

2
rakelib/vendor.rake
View file

@ -225,7 +225,7 @@ namespace "vendor" do
jruby = File.join("vendor", "jruby", "bin", "jruby")
cmd = [jruby, bundler, "install", "--gemfile=tools/Gemfile", "--path", LogStash::Environment::BUNDLE_DIR, "--standalone", "--clean", "--without", "development", "--jobs", "4"]
system(*cmd)
raise $! unless $?.success?
raise RuntimeError, $!.to_s unless $?.success?
break
rescue Gem::RemoteFetcher::FetchError => e
puts e.message