admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #2343 from JCount/gpg-requirement-add-2.1-series

Browse Source 
gpg: add GnuPG series 2.1.x to supported versions
This commit is contained in:
JCount 2017-03-23 10:55:22 -04:00 committed by GitHub
commit d1be51d2cd
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/gpg.rb
View File

@ -5,7 +5,9 @@ class Gpg
which_all(executable).detect do |gpg| which_all(executable).detect do |gpg|
gpg_short_version = Utils.popen_read(gpg, "--version")[/\d\.\d/, 0] gpg_short_version = Utils.popen_read(gpg, "--version")[/\d\.\d/, 0]
next unless gpg_short_version next unless gpg_short_version
Version.create(gpg_short_version.to_s) == Version.create("2.0") gpg_version = Version.create(gpg_short_version.to_s)
gpg_version == Version.create("2.0") ||
gpg_version == Version.create("2.1")
end end
end end

4
Library/Homebrew/requirements/gpg2_requirement.rb
View File

@ -3,10 +3,10 @@ require "gpg"
class GPG2Requirement < Requirement class GPG2Requirement < Requirement
fatal true fatal true
default_formula "gnupg2" default_formula "gnupg"
# MacGPG2/GPGTools installs GnuPG 2.0.x as a vanilla `gpg` symlink # MacGPG2/GPGTools installs GnuPG 2.0.x as a vanilla `gpg` symlink
# pointing to `gpg2`, as do we. Ensure we're actually using a 2.0 `gpg`. # pointing to `gpg2`, as do we. Ensure we're actually using a 2.0 `gpg`.
# Temporarily, only support 2.0.x rather than the 2.1.x "modern" series. # Support both the 2.0.x "stable" and 2.1.x "modern" series.
satisfy(build_env: false) { Gpg.gpg2 || Gpg.gpg } satisfy(build_env: false) { Gpg.gpg2 || Gpg.gpg }
end end