summaryrefslogtreecommitdiffstats
path: root/gem_prelude.rb
diff options
context:
space:
mode:
Diffstat (limited to 'gem_prelude.rb')
-rw-r--r--gem_prelude.rb10
1 files changed, 4 insertions, 6 deletions
diff --git a/gem_prelude.rb b/gem_prelude.rb
index b5da35e18..d2efb8c3a 100644
--- a/gem_prelude.rb
+++ b/gem_prelude.rb
@@ -113,14 +113,11 @@ if defined?(Gem) then
def self.default_dir
if defined? RUBY_FRAMEWORK_VERSION then
- File.join File.dirname(ConfigMap[:sitedir]), 'Gems',
- ConfigMap[:ruby_version]
+ File.join File.dirname(ConfigMap[:sitedir]), 'Gems'
elsif RUBY_VERSION > '1.9' then
- File.join(ConfigMap[:libdir], ConfigMap[:ruby_install_name], 'gems',
- ConfigMap[:ruby_version])
+ File.join(ConfigMap[:libdir], ConfigMap[:ruby_install_name], 'gems')
else
- File.join(ConfigMap[:libdir], ruby_engine, 'gems',
- ConfigMap[:ruby_version])
+ File.join(ConfigMap[:libdir], ruby_engine, 'gems')
end
end
@@ -354,6 +351,7 @@ if defined?(Gem) then
Gem.push_all_highest_version_gems_on_load_path
$" << File.join(Gem::ConfigMap[:libdir], Gem::ConfigMap[:ruby_install_name],
Gem::ConfigMap[:ruby_version], "rubygems.rb")
+
rescue Exception => e
puts "Error loading gem paths on load path in gem_prelude"
puts e