mirror of
https://github.com/aptly-dev/aptly.git
synced 2026-06-02 04:50:49 +00:00
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.
This commit is contained in:
+12
-1
@@ -18,6 +18,9 @@ var (
|
|||||||
_ Verifier = &GpgVerifier{}
|
_ Verifier = &GpgVerifier{}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// Skip GPG version check for GPG 1.x
|
||||||
|
var skipGPGVersionCheck bool
|
||||||
|
|
||||||
// GpgSigner is implementation of Signer interface using gpg as external program
|
// GpgSigner is implementation of Signer interface using gpg as external program
|
||||||
type GpgSigner struct {
|
type GpgSigner struct {
|
||||||
gpg string
|
gpg string
|
||||||
@@ -84,7 +87,7 @@ func cliVersionCheck(cmd string, marker string) bool {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
return strings.Contains(string(output), marker)
|
return skipGPGVersionCheck || strings.Contains(string(output), marker)
|
||||||
}
|
}
|
||||||
|
|
||||||
func findSuitableCLI(cmds []string, versionMarker string) string {
|
func findSuitableCLI(cmds []string, versionMarker string) string {
|
||||||
@@ -426,3 +429,11 @@ func (g *GpgVerifier) ExtractClearsigned(clearsigned io.Reader) (text *os.File,
|
|||||||
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func init() {
|
||||||
|
skipCheck := os.Getenv("APTLY_SKIP_GPG_VERSION_CHECK")
|
||||||
|
switch strings.ToLower(skipCheck) {
|
||||||
|
case "1", "y", "yes", "true":
|
||||||
|
skipGPGVersionCheck = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user