summaryrefslogtreecommitdiff
path: root/lib/rubygems.rb
diff options
context:
space:
mode:
authorkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-10-08 10:53:11 +0000
committerkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-10-08 10:53:11 +0000
commit54ecf81ffc498acb47f025be471fe5177f89b24c (patch)
tree58d16174ec2e337181fb86298c376afc9b54f517 /lib/rubygems.rb
parent370a64cf10a3212106cfb7317fd908296e9ac7ca (diff)
merge revision(s) 33386:
* lib/rubygems: Update to RubyGems 1.8.11. Move Deprecate into the Gem namespace. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33435 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems.rb')
-rw-r--r--lib/rubygems.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/rubygems.rb b/lib/rubygems.rb
index 632b5e0a60..c8f969224c 100644
--- a/lib/rubygems.rb
+++ b/lib/rubygems.rb
@@ -118,7 +118,7 @@ require "rubygems/deprecate"
# -The RubyGems Team
module Gem
- VERSION = '1.8.10'
+ VERSION = '1.8.11'
##
# Raised when RubyGems is unable to load or activate a gem. Contains the
@@ -956,7 +956,7 @@ module Gem
# Returns the Gem::SourceIndex of specifications that are in the Gem.path
def self.source_index
- @@source_index ||= Deprecate.skip_during do
+ @@source_index ||= Gem::Deprecate.skip_during do
SourceIndex.new Gem::Specification.dirs
end
end
@@ -1262,7 +1262,7 @@ require 'rubygems/custom_require'
module Gem
class << self
- extend Deprecate
+ extend Gem::Deprecate
deprecate :activate_dep, "Specification#activate", 2011, 6
deprecate :activate_spec, "Specification#activate", 2011, 6
deprecate :cache, "Gem::source_index", 2011, 8