diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-15 15:13:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-15 15:13:18 +0200 |
| commit | a756161e80cd32b705bb0dfe3ec4753f883ec929 (patch) | |
| tree | 9cb56a2ea3c77201de133eddad8d3bbf04b4a166 /cmd/podmanV2/images/rm.go | |
| parent | ffcb99d8320f7b53548af7210b9705a3590a1bb8 (diff) | |
| parent | 60dde457f6dc5ec5062a946dbd0848a2b0b06a22 (diff) | |
| download | podman-a756161e80cd32b705bb0dfe3ec4753f883ec929.tar.gz podman-a756161e80cd32b705bb0dfe3ec4753f883ec929.tar.bz2 podman-a756161e80cd32b705bb0dfe3ec4753f883ec929.zip | |
Merge pull request #5813 from baude/v2edtests2
More system test fixes on regressions
Diffstat (limited to 'cmd/podmanV2/images/rm.go')
| -rw-r--r-- | cmd/podmanV2/images/rm.go | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/cmd/podmanV2/images/rm.go b/cmd/podmanV2/images/rm.go index bb5880de3..6784182d9 100644 --- a/cmd/podmanV2/images/rm.go +++ b/cmd/podmanV2/images/rm.go @@ -8,6 +8,7 @@ import ( "github.com/containers/libpod/pkg/domain/entities" "github.com/pkg/errors" "github.com/spf13/cobra" + "github.com/spf13/pflag" ) var ( @@ -33,11 +34,13 @@ func init() { Parent: imageCmd, }) - flags := rmCmd.Flags() + imageRemoveFlagSet(rmCmd.Flags()) +} + +func imageRemoveFlagSet(flags *pflag.FlagSet) { flags.BoolVarP(&imageOpts.All, "all", "a", false, "Remove all images") flags.BoolVarP(&imageOpts.Force, "force", "f", false, "Force Removal of the image") } - func rm(cmd *cobra.Command, args []string) error { if len(args) < 1 && !imageOpts.All { @@ -46,7 +49,6 @@ func rm(cmd *cobra.Command, args []string) error { if len(args) > 0 && imageOpts.All { return errors.Errorf("when using the --all switch, you may not pass any images names or IDs") } - report, err := registry.ImageEngine().Delete(registry.GetContext(), args, imageOpts) if err != nil { switch { |