Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

factory: always check const_defined? before requiring

Specifying dependencies with a URL works, even if by accident, but
factory is called repeatedly on this URL and this results in multiple
downloads of the same file.

Fix this by checking const_defined? here too, and DRY up the code a bit.

Fixes #14285.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
  • Loading branch information...
commit 101c418272c7e4ffd388ef84bdb4544574696954 1 parent a831e65
@jacknagel jacknagel authored
Showing with 14 additions and 12 deletions.
  1. +14 −12 Library/Homebrew/formula.rb
View
26 Library/Homebrew/formula.rb
@@ -358,14 +358,15 @@ def self.factory name
if name =~ %r[(https?|ftp)://]
url = name
name = Pathname.new(name).basename
- target_file = HOMEBREW_CACHE_FORMULA+name
+ path = HOMEBREW_CACHE_FORMULA+name
name = name.basename(".rb").to_s
- HOMEBREW_CACHE_FORMULA.mkpath
- FileUtils.rm target_file, :force => true
- curl url, '-o', target_file
+ unless Object.const_defined? self.class_s(name)
+ HOMEBREW_CACHE_FORMULA.mkpath
+ FileUtils.rm path, :force => true
+ curl url, '-o', path
+ end
- require target_file
install_type = :from_url
else
name = Formula.canonical_name(name)
@@ -378,20 +379,21 @@ def self.factory name
path = Pathname.new(name)
name = path.stem
-
- require path unless Object.const_defined? self.class_s(name)
-
install_type = :from_path
- target_file = path.to_s
else
# For names, map to the path and then require
- require Formula.path(name) unless Object.const_defined? self.class_s(name)
+ path = Formula.path(name)
install_type = :from_name
end
end
+ klass_name = self.class_s(name)
+ unless Object.const_defined? klass_name
+ puts "#{$0}: loading #{path}" if ARGV.debug?
+ require path
+ end
+
begin
- klass_name = self.class_s(name)
klass = Object.const_get klass_name
rescue NameError
# TODO really this text should be encoded into the exception
@@ -402,7 +404,7 @@ def self.factory name
end
return klass.new(name) if install_type == :from_name
- return klass.new(name, target_file)
+ return klass.new(name, path.to_s)
rescue LoadError, NameError
raise FormulaUnavailableError.new(name)
end
Please sign in to comment.
Something went wrong with that request. Please try again.