Fix up other code to support new GPG provider structure

This commit is contained in:
Andrey Smirnov
2017-06-03 01:26:37 +03:00
parent 07fde3177b
commit 0e9f966dd1
12 changed files with 53 additions and 14 deletions

View File

@@ -26,7 +26,7 @@ func getSigner(options *SigningOptions) (pgp.Signer, error) {
return nil, nil
}
signer := &pgp.GpgSigner{}
signer := context.GetSigner()
signer.SetKey(options.GpgKey)
signer.SetKeyRing(options.Keyring, options.SecretKeyring)
signer.SetPassphrase(options.Passphrase, options.PassphraseFile)

View File

@@ -9,7 +9,6 @@ import (
"github.com/smira/aptly/aptly"
"github.com/smira/aptly/database"
"github.com/smira/aptly/deb"
"github.com/smira/aptly/pgp"
"github.com/smira/aptly/utils"
)
@@ -297,7 +296,7 @@ func apiReposPackageFromDir(c *gin.Context) {
return
}
verifier := &pgp.GpgVerifier{}
verifier := context.GetVerifier()
var (
sources []string