From ba4a1bb9bd4a644ffa7b07d2a15ec9302d5d45ed Mon Sep 17 00:00:00 2001
From: Matthew Heon <mheon@redhat.com>
Date: Tue, 9 Apr 2019 14:00:21 -0400
Subject: Print header for 'podman images' even with no images
Fixes #2877
Signed-off-by: Matthew Heon <mheon@redhat.com>
---
cmd/podman/images.go | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
(limited to 'cmd/podman')
diff --git a/cmd/podman/images.go b/cmd/podman/images.go
index 6133450be..bea27e2ff 100644
--- a/cmd/podman/images.go
+++ b/cmd/podman/images.go
@@ -318,13 +318,14 @@ func getImagesJSONOutput(ctx context.Context, images []*adapter.ContainerImage)
func generateImagesOutput(ctx context.Context, images []*adapter.ContainerImage, opts imagesOptions) error {
templateMap := GenImageOutputMap()
- if len(images) == 0 {
- return nil
- }
var out formats.Writer
switch opts.format {
case formats.JSONString:
+ // If 0 images are present, print nothing for JSON
+ if len(images) == 0 {
+ return nil
+ }
imagesOutput := getImagesJSONOutput(ctx, images)
out = formats.JSONStructArray{Output: imagesToGeneric([]imagesTemplateParams{}, imagesOutput)}
default:
--
cgit v1.2.3-54-g00ecf