diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-05-31 09:27:29 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-31 09:27:29 -0400 |
| commit | dc67e6a182a09c8b65ef139fb9f15ddfdecae70f (patch) | |
| tree | 8c6cc25dc87deabefe4f89fc2a4d24b14706119c /cmd | |
| parent | ccc087a30e7f84d656663e0b60cd2b918f5288fd (diff) | |
| parent | ec576a54917d902df0de2daa1935ca22b102a2b9 (diff) | |
| download | podman-dc67e6a182a09c8b65ef139fb9f15ddfdecae70f.tar.gz podman-dc67e6a182a09c8b65ef139fb9f15ddfdecae70f.tar.bz2 podman-dc67e6a182a09c8b65ef139fb9f15ddfdecae70f.zip | |
Merge pull request #14419 from Luap99/volume-import
podman volume export/import: give better error
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/podman/volumes/export.go | 6 | ||||
| -rw-r--r-- | cmd/podman/volumes/import.go | 7 |
2 files changed, 11 insertions, 2 deletions
diff --git a/cmd/podman/volumes/export.go b/cmd/podman/volumes/export.go index 5086323f9..113f79a0b 100644 --- a/cmd/podman/volumes/export.go +++ b/cmd/podman/volumes/export.go @@ -8,6 +8,7 @@ import ( "github.com/containers/podman/v4/cmd/podman/common" "github.com/containers/podman/v4/cmd/podman/registry" "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/errorhandling" "github.com/containers/podman/v4/utils" "github.com/pkg/errors" "github.com/sirupsen/logrus" @@ -58,10 +59,13 @@ func export(cmd *cobra.Command, args []string) error { return errors.New("expects output path, use --output=[path]") } inspectOpts.Type = common.VolumeType - volumeData, _, err := containerEngine.VolumeInspect(ctx, args, inspectOpts) + volumeData, errs, err := containerEngine.VolumeInspect(ctx, args, inspectOpts) if err != nil { return err } + if len(errs) > 0 { + return errorhandling.JoinErrors(errs) + } if len(volumeData) < 1 { return errors.New("no volume data found") } diff --git a/cmd/podman/volumes/import.go b/cmd/podman/volumes/import.go index 988c5536d..76a311643 100644 --- a/cmd/podman/volumes/import.go +++ b/cmd/podman/volumes/import.go @@ -8,6 +8,7 @@ import ( "github.com/containers/podman/v4/cmd/podman/parse" "github.com/containers/podman/v4/cmd/podman/registry" "github.com/containers/podman/v4/pkg/domain/entities" + "github.com/containers/podman/v4/pkg/errorhandling" "github.com/containers/podman/v4/utils" "github.com/pkg/errors" "github.com/spf13/cobra" @@ -60,10 +61,14 @@ func importVol(cmd *cobra.Command, args []string) error { } inspectOpts.Type = common.VolumeType - volumeData, _, err := containerEngine.VolumeInspect(ctx, volumes, inspectOpts) + inspectOpts.Type = common.VolumeType + volumeData, errs, err := containerEngine.VolumeInspect(ctx, volumes, inspectOpts) if err != nil { return err } + if len(errs) > 0 { + return errorhandling.JoinErrors(errs) + } if len(volumeData) < 1 { return errors.New("no volume data found") } |