diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-03-26 21:36:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-26 21:36:36 +0100 |
| commit | 6a46a87d08bd1e9ddda3dd3c9c30d21d2226a654 (patch) | |
| tree | 6fc011ab6c7114ec215e0443e935396150c3dac1 /pkg/domain/infra/abi/images.go | |
| parent | 913426c70c37a87d425085f60af397f7b38bd65d (diff) | |
| parent | c5ce210f7d091a4fa6d69abb9b4068c811a26129 (diff) | |
| download | podman-6a46a87d08bd1e9ddda3dd3c9c30d21d2226a654.tar.gz podman-6a46a87d08bd1e9ddda3dd3c9c30d21d2226a654.tar.bz2 podman-6a46a87d08bd1e9ddda3dd3c9c30d21d2226a654.zip | |
Merge pull request #5625 from baude/v2pods
podmanv2 pod subcommands
Diffstat (limited to 'pkg/domain/infra/abi/images.go')
| -rw-r--r-- | pkg/domain/infra/abi/images.go | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pkg/domain/infra/abi/images.go b/pkg/domain/infra/abi/images.go index 203f14987..e3b3e310b 100644 --- a/pkg/domain/infra/abi/images.go +++ b/pkg/domain/infra/abi/images.go @@ -46,7 +46,7 @@ func (ir *ImageEngine) Delete(ctx context.Context, nameOrId []string, opts entit err = ir.deleteImage(ctx, img, opts, report) report.Errors = append(report.Errors, err) } - if len(targets) >= 0 || len(previousTargets) != 1 { + if len(previousTargets) != 1 { goto repeatRun } return &report, nil @@ -83,9 +83,7 @@ func (ir *ImageEngine) deleteImage(ctx context.Context, img *libpodImage.Image, } report.Deleted = append(report.Deleted, results.Deleted) - for _, e := range results.Untagged { - report.Untagged = append(report.Untagged, e) - } + report.Untagged = append(report.Untagged, results.Untagged...) return nil } |