mirror of
https://github.com/containers/podman.git
synced 2025-12-02 11:08:36 +08:00
vendor latest c/common main
Includes a new libnetwork API to get the rootlessnetns ips. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
11
vendor/github.com/containers/common/pkg/secrets/secrets.go
generated
vendored
11
vendor/github.com/containers/common/pkg/secrets/secrets.go
generated
vendored
@@ -218,11 +218,12 @@ func (s *SecretsManager) Store(name string, data []byte, driverType string, opti
|
||||
}
|
||||
|
||||
if options.Replace {
|
||||
if err := driver.Delete(secr.ID); err != nil && !errors.Is(err, define.ErrNoSuchSecret) {
|
||||
return "", fmt.Errorf("deleting secret %s: %w", secr.ID, err)
|
||||
}
|
||||
|
||||
if err == nil {
|
||||
err := driver.Delete(secr.ID)
|
||||
if err != nil {
|
||||
if !errors.Is(err, define.ErrNoSuchSecret) {
|
||||
return "", fmt.Errorf("deleting driver secret %s: %w", secr.ID, err)
|
||||
}
|
||||
} else {
|
||||
if err := s.delete(secr.ID); err != nil && !errors.Is(err, define.ErrNoSuchSecret) {
|
||||
return "", fmt.Errorf("deleting secret %s: %w", secr.ID, err)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user