зеркало из https://github.com/github/ruby.git
rubygems: fix variable name
* 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:
Родитель
c10d7640b2
Коммит
ce59e249a5
|
@ -20,8 +20,7 @@ if Gem::GEM_PRELUDE_SUCKAGE and defined?(Gem::QuickLoader) then
|
|||
|
||||
$LOADED_FEATURES.delete Gem::QuickLoader.path_to_full_rubygems_library
|
||||
|
||||
if $LOADED_FEATURES.any? do |path| path.end_with? '/rubygems.rb' end then
|
||||
# TODO path does not exist here
|
||||
if path = $LOADED_FEATURES.find {|n| n.end_with? '/rubygems.rb'} then
|
||||
raise LoadError, "another rubygems is already loaded from #{path}"
|
||||
end
|
||||
|
||||
|
|
|
@ -2456,8 +2456,8 @@ class Gem::Specification < Gem::BasicSpecification
|
|||
extend Gem::UserInteraction
|
||||
normalize
|
||||
|
||||
nil_attributes = self.class.non_nil_attributes.find_all do |name|
|
||||
instance_variable_get("@#{name}").nil?
|
||||
nil_attributes = self.class.non_nil_attributes.find_all do |attrname|
|
||||
instance_variable_get("@#{attrname}").nil?
|
||||
end
|
||||
|
||||
unless nil_attributes.empty? then
|
||||
|
|
Загрузка…
Ссылка в новой задаче