mirror of
https://github.com/containers/podman.git
synced 2025-12-01 10:38:05 +08:00
Vendor in containers/(storage,image, common, buildah)
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
7
vendor/github.com/containers/buildah/pkg/sshagent/sshagent.go
generated
vendored
7
vendor/github.com/containers/buildah/pkg/sshagent/sshagent.go
generated
vendored
@@ -1,6 +1,8 @@
|
||||
package sshagent
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
"io/ioutil"
|
||||
"net"
|
||||
@@ -10,7 +12,6 @@ import (
|
||||
"time"
|
||||
|
||||
"github.com/opencontainers/selinux/go-selinux"
|
||||
"github.com/pkg/errors"
|
||||
"github.com/sirupsen/logrus"
|
||||
"golang.org/x/crypto/ssh"
|
||||
"golang.org/x/crypto/ssh/agent"
|
||||
@@ -40,7 +41,7 @@ func newAgentServerKeyring(keys []interface{}) (*AgentServer, error) {
|
||||
a := agent.NewKeyring()
|
||||
for _, k := range keys {
|
||||
if err := a.Add(agent.AddedKey{PrivateKey: k}); err != nil {
|
||||
return nil, errors.Wrap(err, "failed to create ssh agent")
|
||||
return nil, fmt.Errorf("failed to create ssh agent: %w", err)
|
||||
}
|
||||
}
|
||||
return &AgentServer{
|
||||
@@ -216,7 +217,7 @@ func NewSource(paths []string) (*Source, error) {
|
||||
|
||||
k, err := ssh.ParseRawPrivateKey(dt)
|
||||
if err != nil {
|
||||
return nil, errors.Wrapf(err, "cannot parse ssh key")
|
||||
return nil, fmt.Errorf("cannot parse ssh key: %w", err)
|
||||
}
|
||||
keys = append(keys, k)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user