diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-20 15:23:21 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-20 15:23:21 -0400 |
| commit | 80355b168c0754fd5dba3c8ac371fc614d23dc2f (patch) | |
| tree | 44a3372317ce39514db0adc412fb791a247db17e /cmd/podman/diff.go | |
| parent | 06152434e629c86710ca94e075088b89fb26f126 (diff) | |
| parent | 3eac39aaa062c32597ed355d820f2dafc038faf0 (diff) | |
| download | podman-80355b168c0754fd5dba3c8ac371fc614d23dc2f.tar.gz podman-80355b168c0754fd5dba3c8ac371fc614d23dc2f.tar.bz2 podman-80355b168c0754fd5dba3c8ac371fc614d23dc2f.zip | |
Merge pull request #5897 from jwhonce/wip/diff
V2 Fix --latest for podman diff commands
Diffstat (limited to 'cmd/podman/diff.go')
| -rw-r--r-- | cmd/podman/diff.go | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/cmd/podman/diff.go b/cmd/podman/diff.go index 8db76e8af..ec94c0918 100644 --- a/cmd/podman/diff.go +++ b/cmd/podman/diff.go @@ -46,10 +46,9 @@ func init() { } func diff(cmd *cobra.Command, args []string) error { - if found, err := registry.ImageEngine().Exists(registry.GetContext(), args[0]); err != nil { - return err - } else if found.Value { - return images.Diff(cmd, args, diffOpts) + // Latest implies looking for a container + if diffOpts.Latest { + return containers.Diff(cmd, args, diffOpts) } if found, err := registry.ContainerEngine().ContainerExists(registry.GetContext(), args[0]); err != nil { @@ -57,5 +56,12 @@ func diff(cmd *cobra.Command, args []string) error { } else if found.Value { return containers.Diff(cmd, args, diffOpts) } + + if found, err := registry.ImageEngine().Exists(registry.GetContext(), args[0]); err != nil { + return err + } else if found.Value { + return images.Diff(cmd, args, diffOpts) + } + return fmt.Errorf("%s not found on system", args[0]) } |