From e5acf222854cd498c5b992a34fde3483b8b93c75 Mon Sep 17 00:00:00 2001
From: Andrey Smirnov <smirnov.andrey@gmail.com>
Date: Fri, 25 May 2018 00:06:00 +0300
Subject: [PATCH] Skip GPG version check `APTLY_SKIP_GPG_VERSION_CHECK=1` is
 set in the environment

This allows to force using GnuPG 2.x even if aptly is not 100% ready
to use it.
---
 pgp/gnupg.go | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/pgp/gnupg.go b/pgp/gnupg.go
index 4f576193..5d416281 100644
--- a/pgp/gnupg.go
+++ b/pgp/gnupg.go
@@ -18,6 +18,9 @@ var (
 	_ Verifier = &GpgVerifier{}
 )
 
+// Skip GPG version check for GPG 1.x
+var skipGPGVersionCheck bool
+
 // GpgSigner is implementation of Signer interface using gpg as external program
 type GpgSigner struct {
 	gpg                        string
@@ -84,7 +87,7 @@ func cliVersionCheck(cmd string, marker string) bool {
 	if err != nil {
 		return false
 	}
-	return strings.Contains(string(output), marker)
+	return skipGPGVersionCheck || strings.Contains(string(output), marker)
 }
 
 func findSuitableCLI(cmds []string, versionMarker string) string {
@@ -426,3 +429,11 @@ func (g *GpgVerifier) ExtractClearsigned(clearsigned io.Reader) (text *os.File,
 
 	return
 }
+
+func init() {
+	skipCheck := os.Getenv("APTLY_SKIP_GPG_VERSION_CHECK")
+	switch strings.ToLower(skipCheck) {
+	case "1", "y", "yes", "true":
+		skipGPGVersionCheck = true
+	}
+}