From f02af9f242b3888005d9f2eb18dab205bf09a53d Mon Sep 17 00:00:00 2001 From: Jonathon Anderson Date: Fri, 2 Aug 2024 16:26:43 -0600 Subject: [PATCH] Container list shows size if any size option specified Signed-off-by: Jonathon Anderson --- internal/app/wwctl/container/list/main.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/app/wwctl/container/list/main.go b/internal/app/wwctl/container/list/main.go index e9402e0b..0135bdd3 100644 --- a/internal/app/wwctl/container/list/main.go +++ b/internal/app/wwctl/container/list/main.go @@ -16,7 +16,8 @@ var containerList = apicontainer.ContainerList func CobraRunE(vars *variables) func(cmd *cobra.Command, args []string) (err error) { return func(cmd *cobra.Command, args []string) (err error) { - if vars.size || vars.full || vars.kernel { + showSize := vars.size || vars.chroot || vars.compressed + if showSize || vars.full || vars.kernel { containerInfo, err := containerList() if err != nil { wwlog.Error("%s", err) @@ -55,7 +56,7 @@ func CobraRunE(vars *variables) func(cmd *cobra.Command, args []string) (err err } ph.Render() - } else if vars.size { + } else if showSize { ph := helper.NewPrintHelper([]string{"CONTAINER NAME", "NODES", "SIZE"}) for i := 0; i < len(containerInfo); i++ { sz := util.ByteToString(int64(containerInfo[i].ImgSize))