Merge pull request #3032 from DomT4/gpg_tweaks

gpg: minor search priority tweaks

2 files changed, 7 insertions, 7 deletions

diff --git a/Library/Homebrew/gpg.rb b/Library/Homebrew/gpg.rb
index cb9e367df..3b7c4f726 100644
--- a/Library/Homebrew/gpg.rb
+++ b/Library/Homebrew/gpg.rb
@@ -7,8 +7,8 @@ class Gpg
       next unless gpg_short_version
       gpg_version = Version.create(gpg_short_version.to_s)
       @version = gpg_version
-      gpg_version == Version.create("2.0") ||
-        gpg_version == Version.create("2.1")
+      gpg_version == Version.create("2.1") ||
+        gpg_version == Version.create("2.0")
     end
   end
 
@@ -20,7 +20,7 @@ class Gpg
     find_gpg("gpg2")
   end
 
-  GPG_EXECUTABLE = gpg2 || gpg
+  GPG_EXECUTABLE = gpg || gpg2
 
   def self.available?
     File.executable?(GPG_EXECUTABLE.to_s)
diff --git a/Library/Homebrew/requirements/gpg2_requirement.rb b/Library/Homebrew/requirements/gpg2_requirement.rb
index 97fabcca0..d570983eb 100644
--- a/Library/Homebrew/requirements/gpg2_requirement.rb
+++ b/Library/Homebrew/requirements/gpg2_requirement.rb
@@ -5,8 +5,8 @@ class GPG2Requirement < Requirement
   fatal true
   default_formula "gnupg"
 
-  # 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`.
-  # Support both the 2.0.x "stable" and 2.1.x "modern" series.
-  satisfy(build_env: false) { Gpg.gpg2 || Gpg.gpg }
+  # GPGTools installs GnuPG 2.0.x as a vanilla `gpg` symlink
+  # pointing to `gpg2`. Homebrew install 2.1.x as a non-symlink `gpg`.
+  # We support both the 2.0.x "stable" and 2.1.x "modern" series here.
+  satisfy(build_env: false) { Gpg.gpg || Gpg.gpg2 }
 end