1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rubygems: fix variable name

Browse Source 
* lib/rubygems/compatibility.rb: fix out-of-scope local variable.

* lib/rubygems/specification.rb (Gem::Specification#validate): get
  rid of conflict between a local variable and a method name.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48985 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-12-25 03:37:54 +00:00
parent c10d7640b2
commit ce59e249a5
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/rubygems/compatibility.rb
View File

@ -20,8 +20,7 @@ if Gem::GEM_PRELUDE_SUCKAGE and defined?(Gem::QuickLoader) then
$LOADED_FEATURES.delete Gem::QuickLoader.path_to_full_rubygems_library $LOADED_FEATURES.delete Gem::QuickLoader.path_to_full_rubygems_library
if $LOADED_FEATURES.any? do |path| path.end_with? '/rubygems.rb' end then if path = $LOADED_FEATURES.find {|n| n.end_with? '/rubygems.rb'} then
# TODO path does not exist here
raise LoadError, "another rubygems is already loaded from #{path}" raise LoadError, "another rubygems is already loaded from #{path}"
end end

4
lib/rubygems/specification.rb
View File

@ -2456,8 +2456,8 @@ class Gem::Specification < Gem::BasicSpecification
extend Gem::UserInteraction extend Gem::UserInteraction
normalize normalize
nil_attributes = self.class.non_nil_attributes.find_all do |name| nil_attributes = self.class.non_nil_attributes.find_all do |attrname|
instance_variable_get("@#{name}").nil? instance_variable_get("@#{attrname}").nil?
end end
unless nil_attributes.empty? then unless nil_attributes.empty? then