diff options
| author | Mike McQuaid | 2018-01-18 15:30:56 +0000 | 
|---|---|---|
| committer | GitHub | 2018-01-18 15:30:56 +0000 | 
| commit | 8a45467ad9c61d50db86614730e54c59e804acd8 (patch) | |
| tree | 380d9ed4e0a0a295940accbf53f8179d4360f4f8 /Library/Homebrew/formula.rb | |
| parent | 1aa8aff84ae732c95827c21dd00b8ac377ede713 (diff) | |
| parent | b70b5429d09d13526ccc08c67fd6a6373b471409 (diff) | |
| download | brew-8a45467ad9c61d50db86614730e54c59e804acd8.tar.bz2 | |
Merge pull request #3661 from MikeMcQuaid/deprecate-default-formula
Deprecate default_formula Requirement DSL
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 2b7460408..ad7e28a2e 100644 --- a/Library/Homebrew/formula.rb +++ b/Library/Homebrew/formula.rb @@ -1487,15 +1487,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 @@ -1553,7 +1548,6 @@ class Formula      hsh["requirements"] = requirements.map do |req|        {          "name" => req.name, -        "default_formula" => req.default_formula,          "cask" => req.cask,          "download" => req.download,        } | 
