Fix output of wwctl container show
Commit d8cd6049 introduced erroneous output coming from an
inner function of container show, and (seemingly) erroneously
replaces valid kernel versions with "not found". This commit
fixes both of those issues, and moves the output to the outer
cli function.
This commit is contained in:
@@ -25,6 +25,7 @@ func CobraRunE(cmd *cobra.Command, args []string) (err error) {
|
||||
fmt.Printf("%s\n", r.Rootfs)
|
||||
} else {
|
||||
fmt.Printf("Name: %s\n", r.Name)
|
||||
fmt.Printf("KernelVersion: %s\n", r.KernelVersion)
|
||||
fmt.Printf("Rootfs: %s\n", r.Rootfs)
|
||||
fmt.Printf("Nr nodes: %d\n", len(r.Nodes))
|
||||
fmt.Printf("Nodes: %s\n", r.Nodes)
|
||||
|
||||
@@ -315,9 +315,8 @@ func ContainerShow(csp *wwapiv1.ContainerShowParameter) (response *wwapiv1.Conta
|
||||
rootFsDir := container.RootFsDir(containerName)
|
||||
|
||||
kernelVersion := container.KernelVersion(containerName)
|
||||
if kernelVersion != "" {
|
||||
if kernelVersion == "" {
|
||||
kernelVersion = "not found"
|
||||
fmt.Printf("Kernelversion: %s\n", kernelVersion)
|
||||
}
|
||||
|
||||
nodeDB, err := node.New()
|
||||
@@ -333,7 +332,6 @@ func ContainerShow(csp *wwapiv1.ContainerShowParameter) (response *wwapiv1.Conta
|
||||
var nodeList []string
|
||||
for _, n := range nodes {
|
||||
if n.ContainerName.Get() == containerName {
|
||||
|
||||
nodeList = append(nodeList, n.Id.Get())
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user