summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQi Wang <qiwan@redhat.com>2019-08-04 09:53:14 -0400
committerQi Wang <qiwan@redhat.com>2019-08-04 10:00:29 -0400
commit1da897d505717d2cc5fecca06ac2c22ebe2bc9b3 (patch)
tree75e99813a521999071e58a051559a1d83554ce15
parent140e08ef64591ecbce11ba8fff94afa8e5e65eeb (diff)
downloadpodman-1da897d505717d2cc5fecca06ac2c22ebe2bc9b3.tar.gz
podman-1da897d505717d2cc5fecca06ac2c22ebe2bc9b3.tar.bz2
podman-1da897d505717d2cc5fecca06ac2c22ebe2bc9b3.zip
fix system df crashes on unnamed images
if the image is unnamed, pass an nil slice to the parse repotags function instead of getting the image name by index. after this patch, unnamed images will be shown as <none> ``` Images space usage: REPOSITORY TAG IMAGE ID CREATED SIZE SHARED SIZE UNIQUE SIZE CONTAINERS docker.io/library/ubuntu bionic 3556258649b2 11 days ago 66.6MB 0B 66.6MB 0 <none> <none> dd8a8db2c79b 11 days ago 986MB 66.6MB 919MB 0 ``` Signed-off-by: Qi Wang <qiwan@redhat.com>
-rw-r--r--cmd/podman/system_df.go8
1 files changed, 4 insertions, 4 deletions
diff --git a/cmd/podman/system_df.go b/cmd/podman/system_df.go
index 6b9824a79..44582a802 100644
--- a/cmd/podman/system_df.go
+++ b/cmd/podman/system_df.go
@@ -460,11 +460,11 @@ func getImageVerboseDiskUsage(ctx context.Context, images []*image.Image, images
}
var repo string
var tag string
- if len(img.Names()) == 0 {
- repo = "<none>"
- tag = "<none>"
+ var repotags []string
+ if len(img.Names()) != 0 {
+ repotags = []string{img.Names()[0]}
}
- repopairs, err := image.ReposToMap([]string{img.Names()[0]})
+ repopairs, err := image.ReposToMap(repotags)
if err != nil {
logrus.Errorf("error finding tag/digest for %s", img.ID())
}