1
0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-21 14:50:08 +03:00

B #4929: Preserve site_ruby in paths, use realpath (#33)

(cherry picked from commit 7872274c9b7ab40d3fd3a1fd5622387e7031dd2c)
This commit is contained in:
Vlastimil Holer 2020-06-22 15:18:57 +02:00 committed by Ruben S. Montero
parent 95733d5248
commit 513b5b911d
No known key found for this signature in database
GPG Key ID: A0CEA6FA880A1D87
191 changed files with 573 additions and 379 deletions

View File

@ -31,8 +31,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -50,8 +50,9 @@ end
FENCE_HOST = File.dirname(__FILE__) + '/fence_host.sh'
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -32,8 +32,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -31,8 +31,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -29,8 +29,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -29,8 +29,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -29,8 +29,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -29,8 +29,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -29,8 +29,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -29,8 +29,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -29,8 +29,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -29,8 +29,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -27,8 +27,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -27,8 +27,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -27,8 +27,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -27,8 +27,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -27,8 +27,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -29,8 +29,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -27,8 +27,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -27,8 +27,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -29,8 +29,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -27,8 +27,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -27,8 +27,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -29,8 +29,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -33,8 +33,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -27,8 +27,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -27,8 +27,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -27,8 +27,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -27,8 +27,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -29,8 +29,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -27,8 +27,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -27,8 +27,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -27,8 +27,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -27,8 +27,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -27,8 +27,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -27,8 +27,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -27,8 +27,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -26,8 +26,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -26,8 +26,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -26,8 +26,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -26,8 +26,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -26,8 +26,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -26,8 +26,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -26,8 +26,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -26,8 +26,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -26,8 +26,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -26,8 +26,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -26,8 +26,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -26,8 +26,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -26,8 +26,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -26,8 +26,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -26,8 +26,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -26,8 +26,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -26,8 +26,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -26,8 +26,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -26,8 +26,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -26,8 +26,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -26,8 +26,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -26,8 +26,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -41,8 +41,9 @@ TEMPLATE_LOCATION = ETC_LOCATION + '/ec2query_templates'
VIEWS_LOCATION = RUBY_LIB_LOCATION + '/cloud/econe/views'
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -32,8 +32,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -27,8 +27,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -27,8 +27,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -31,8 +31,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -31,8 +31,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -31,8 +31,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -31,8 +31,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -31,8 +31,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -29,8 +29,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -27,8 +27,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -38,8 +38,9 @@ ONEFLOW_LOG = LOG_LOCATION + '/oneflow.log'
CONFIGURATION_FILE = ETC_LOCATION + '/oneflow-server.conf'
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -39,8 +39,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -29,8 +29,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -31,8 +31,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -27,8 +27,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -27,8 +27,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -27,8 +27,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -27,8 +27,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -28,8 +28,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -27,8 +27,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -27,8 +27,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -27,8 +27,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -27,8 +27,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -27,8 +27,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -31,8 +31,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -27,8 +27,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -27,8 +27,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -27,8 +27,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -27,8 +27,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -27,8 +27,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -27,8 +27,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -27,8 +27,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -27,8 +27,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -29,8 +29,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

View File

@ -53,8 +53,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << PACKET_LOCATION

View File

@ -47,8 +47,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << PACKET_LOCATION

View File

@ -60,8 +60,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << PACKET_LOCATION

View File

@ -81,8 +81,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << PACKET_LOCATION

View File

@ -45,8 +45,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << PACKET_LOCATION

View File

@ -32,8 +32,9 @@ else
end
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
$LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
require 'rubygems'
Gem.use_paths(File.realpath(GEMS_LOCATION))
end
$LOAD_PATH << RUBY_LIB_LOCATION

Some files were not shown because too many files have changed in this diff Show More