aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/gpg.rb
diff options
context:
space:
mode:
Diffstat (limited to 'Library/Homebrew/gpg.rb')
-rw-r--r--Library/Homebrew/gpg.rb7
1 files changed, 4 insertions, 3 deletions
diff --git a/Library/Homebrew/gpg.rb b/Library/Homebrew/gpg.rb
index cb9e367df..f56473df3 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)
@@ -38,6 +38,7 @@ class Gpg
Key-Length: 2048
Subkey-Type: RSA
Subkey-Length: 2048
+ Passphrase: ''
Name-Real: Testing
Name-Email: testing@foo.bar
Expire-Date: 1d