+ Removed pkgs/sources/lib/sources.rb

+ Gem.sources no longer tries to load sources gem. Only uses default_sources.
rubygems · Apr 4, 2011 · e72e92f · e72e92f
1 parent c4785ee
commit e72e92f
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 29 deletions.
diff --git a/lib/rubygems.rb b/lib/rubygems.rb
@@ -1013,23 +1013,14 @@ def self.source_index
   # default_sources if it is not installed.
 
   def self.sources
-    if @sources.empty? then
-      begin
-        gem 'sources', '> 0.0.1'
-        require 'sources'
-      rescue LoadError
-        @sources = default_sources
-      end
-    end
-
-    @sources
+    @sources ||= default_sources
   end
 
   ##
   # Need to be able to set the sources without calling
   # Gem.sources.replace since that would cause an infinite loop.
 
-  def self.sources=(new_sources)
+  def self.sources= new_sources
     @sources = new_sources
   end
 

diff --git a/lib/rubygems/local_remote_options.rb b/lib/rubygems/local_remote_options.rb
@@ -76,7 +76,7 @@ def add_clear_sources_option
     add_option(:"Local/Remote", '--clear-sources',
                'Clear the gem sources') do |value, options|
 
-      Gem.sources.clear
+      Gem.sources = nil
       options[:sources_cleared] = true
     end
   end

diff --git a/pkgs/sources/lib/sources.rb b/pkgs/sources/lib/sources.rb
diff --git a/pkgs/sources/sources.gemspec b/pkgs/sources/sources.gemspec