diff options
| author | Mike McQuaid | 2018-01-14 13:27:43 +0000 | 
|---|---|---|
| committer | Mike McQuaid | 2018-01-14 13:27:43 +0000 | 
| commit | b70b5429d09d13526ccc08c67fd6a6373b471409 (patch) | |
| tree | f8fea6c707140cb62b0a9936db1e506431c8b46e /Library/Homebrew/formula.rb | |
| parent | b66010605dfb8ecd7e5eb9eb5d1b97462c259e4d (diff) | |
| download | brew-b70b5429d09d13526ccc08c67fd6a6373b471409.tar.bz2 | |
Deprecate default_formula Requirement DSL
This has been a nightmare in terms of the complexity to our dependency
system and the whack-a-mole required on bugs. If a Requirement resolves
to a Formula it should just use `depends_on "formula"` instead. This
matches the effective behaviour all users of bottles (the vast majority
of users and installs) and what we're doing in Homebrew/homebrew-core.
Diffstat (limited to 'Library/Homebrew/formula.rb')
| -rw-r--r-- | Library/Homebrew/formula.rb | 8 | 
1 files changed, 1 insertions, 7 deletions
| diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb index 8e4f80260..eb499d958 100644 --- a/Library/Homebrew/formula.rb +++ b/Library/Homebrew/formula.rb @@ -1486,15 +1486,10 @@ class Formula    # Returns a list of Dependency objects that are required at runtime.    # @private    def runtime_dependencies -    runtime_dependencies = recursive_dependencies do |_, dependency| +    recursive_dependencies do |_, dependency|        Dependency.prune if dependency.build?        Dependency.prune if !dependency.required? && build.without?(dependency)      end -    runtime_requirement_deps = recursive_requirements do |_, requirement| -      Requirement.prune if requirement.build? -      Requirement.prune if !requirement.required? && build.without?(requirement) -    end.map(&:to_dependency).compact -    runtime_dependencies + runtime_requirement_deps    end    # Returns a list of formulae depended on by this formula that aren't @@ -1552,7 +1547,6 @@ class Formula      hsh["requirements"] = requirements.map do |req|        {          "name" => req.name, -        "default_formula" => req.default_formula,          "cask" => req.cask,          "download" => req.download,        } | 
