From e02ad2242ab98f9ea7418ef51741480e3bfa4ed1 Mon Sep 17 00:00:00 2001 From: Dominyk Tiller <dominyktiller@gmail.com> Date: Wed, 10 Aug 2016 21:00:14 +0100 Subject: [PATCH] gpg_requirement: rename to gpg2_requirement --- Library/Homebrew/compat/requirements.rb | 3 ++- Library/Homebrew/dependency_collector.rb | 2 +- Library/Homebrew/requirements.rb | 2 +- .../requirements/{gpg_requirement.rb => gpg2_requirement.rb} | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) rename Library/Homebrew/requirements/{gpg_requirement.rb => gpg2_requirement.rb} (90%) diff --git a/Library/Homebrew/compat/requirements.rb b/Library/Homebrew/compat/requirements.rb index 2adeaaa2e9..5c3c7a09c7 100644 --- a/Library/Homebrew/compat/requirements.rb +++ b/Library/Homebrew/compat/requirements.rb @@ -3,7 +3,8 @@ require "requirements" XcodeDependency = XcodeRequirement MysqlDependency = MysqlRequirement PostgresqlDependency = PostgresqlRequirement -GPGDependency = GPGRequirement +GPGDependency = GPG2Requirement +GPGRequirement = GPG2Requirement TeXDependency = TeXRequirement MercurialDependency = MercurialRequirement GitDependency = GitRequirement diff --git a/Library/Homebrew/dependency_collector.rb b/Library/Homebrew/dependency_collector.rb index 9d208ec1de..122828191d 100644 --- a/Library/Homebrew/dependency_collector.rb +++ b/Library/Homebrew/dependency_collector.rb @@ -99,7 +99,7 @@ class DependencyCollector when :macos then MinimumMacOSRequirement.new(tags) when :mysql then MysqlRequirement.new(tags) when :postgresql then PostgresqlRequirement.new(tags) - when :gpg then GPGRequirement.new(tags) + when :gpg then GPG2Requirement.new(tags) when :fortran then FortranRequirement.new(tags) when :mpi then MPIRequirement.new(*tags) when :tex then TeXRequirement.new(tags) diff --git a/Library/Homebrew/requirements.rb b/Library/Homebrew/requirements.rb index 8ba83b0c57..e709ff9ccd 100644 --- a/Library/Homebrew/requirements.rb +++ b/Library/Homebrew/requirements.rb @@ -1,7 +1,7 @@ require "requirement" require "requirements/apr_requirement" require "requirements/fortran_requirement" -require "requirements/gpg_requirement" +require "requirements/gpg2_requirement" require "requirements/language_module_requirement" require "requirements/minimum_macos_requirement" require "requirements/maximum_macos_requirement" diff --git a/Library/Homebrew/requirements/gpg_requirement.rb b/Library/Homebrew/requirements/gpg2_requirement.rb similarity index 90% rename from Library/Homebrew/requirements/gpg_requirement.rb rename to Library/Homebrew/requirements/gpg2_requirement.rb index bb41f0b0b1..9eea59e786 100644 --- a/Library/Homebrew/requirements/gpg_requirement.rb +++ b/Library/Homebrew/requirements/gpg2_requirement.rb @@ -1,7 +1,7 @@ require "requirement" require "gpg" -class GPGRequirement < Requirement +class GPG2Requirement < Requirement fatal true default_formula "gnupg2" -- GitLab