vincent/aptly
1
0
Fork 0
mirror of https://github.com/aptly-dev/aptly.git synced 2026-04-17 19:08:13 +00:00
Code Issues Projects Releases Wiki Activity

Skip GPG version check APTLY_SKIP_GPG_VERSION_CHECK=1 is set in the environment

Browse Source 
This allows to force using GnuPG 2.x even if aptly is not 100% ready
to use it.
This commit is contained in:
Andrey Smirnov
2018-05-25 00:06:00 +03:00
parent 5f904a164c
commit e5acf22285
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pgp/gnupg.go
View File

@@ -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
}
}