forked from pool/vagrant
ae43736fe3
OBS-URL: https://build.opensuse.org/request/show/381084 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vagrant?expand=0&rev=1
28 lines
906 B
Diff
28 lines
906 B
Diff
From: Antonio Terceiro <terceiro@debian.org>
|
|
Date: Sat, 11 Oct 2014 17:17:52 -0300
|
|
Subject: Look up vagrant/pre-rubygems.rb from the installed package
|
|
|
|
---
|
|
bin/vagrant | 6 +++++-
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/bin/vagrant b/bin/vagrant
|
|
index 452ace8..db0aa2f 100755
|
|
--- a/bin/vagrant
|
|
+++ b/bin/vagrant
|
|
@@ -50,9 +50,13 @@ end
|
|
if !ENV["VAGRANT_INTERNAL_BUNDLERIZED"]
|
|
require "rbconfig"
|
|
ruby_path = File.join(RbConfig::CONFIG["bindir"], RbConfig::CONFIG["ruby_install_name"])
|
|
+ pre_rubygems = File.expand_path("../../lib/vagrant/pre-rubygems.rb", __FILE__)
|
|
+ unless File.exists?(pre_rubygems)
|
|
+ pre_rubygems = '/usr/lib/ruby/vendor_ruby/vagrant/pre-rubygems.rb'
|
|
+ end
|
|
Kernel.exec(
|
|
ruby_path,
|
|
- File.expand_path("../../lib/vagrant/pre-rubygems.rb", __FILE__),
|
|
+ pre_rubygems,
|
|
*ARGV)
|
|
raise "Fatal error: this line should never be reached"
|
|
end
|