diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/rubygems.rb | 23 | ||||
| -rw-r--r-- | lib/rubygems/commands/cleanup_command.rb | 3 |
2 files changed, 14 insertions, 12 deletions
diff --git a/lib/rubygems.rb b/lib/rubygems.rb index 914204858c..a7bc959965 100644 --- a/lib/rubygems.rb +++ b/lib/rubygems.rb @@ -1042,18 +1042,19 @@ module Gem MARSHAL_SPEC_DIR = "quick/Marshal.#{Gem.marshal_version}/" - autoload :Version, 'rubygems/version' - autoload :Requirement, 'rubygems/requirement' - autoload :Dependency, 'rubygems/dependency' - autoload :DependencyList, 'rubygems/dependency_list' - autoload :SourceList, 'rubygems/source_list' - autoload :SpecFetcher, 'rubygems/spec_fetcher' - autoload :Specification, 'rubygems/specification' - autoload :PathSupport, 'rubygems/path_support' - autoload :Platform, 'rubygems/platform' - autoload :ConfigFile, 'rubygems/config_file' + autoload :ConfigFile, 'rubygems/config_file' + autoload :Dependency, 'rubygems/dependency' + autoload :DependencyList, 'rubygems/dependency_list' autoload :DependencyResolver, 'rubygems/dependency_resolver' - autoload :RequestSet, 'rubygems/request_set' + autoload :PathSupport, 'rubygems/path_support' + autoload :Platform, 'rubygems/platform' + autoload :RequestSet, 'rubygems/request_set' + autoload :Requirement, 'rubygems/requirement' + autoload :SourceList, 'rubygems/source_list' + autoload :SpecFetcher, 'rubygems/spec_fetcher' + autoload :Specification, 'rubygems/specification' + autoload :Version, 'rubygems/version' + autoload :Source, 'rubygems/source' require "rubygems/specification" end diff --git a/lib/rubygems/commands/cleanup_command.rb b/lib/rubygems/commands/cleanup_command.rb index dc919e5570..f18a94d7a2 100644 --- a/lib/rubygems/commands/cleanup_command.rb +++ b/lib/rubygems/commands/cleanup_command.rb @@ -66,6 +66,7 @@ are not removed. deps = deplist.strongly_connected_components.flatten.reverse + original_home = Gem.dir original_path = Gem.path deps.each do |spec| @@ -97,7 +98,7 @@ are not removed. end # Restore path Gem::Uninstaller may have change - Gem.use_paths(*original_path) + Gem.use_paths(original_home, *original_path) end say "Clean Up Complete" |