kelvin/warewulf
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Remove trailing newline from wwlog

Browse Source 
I noticed that some wwlog calls included a trailing newline, but others
did not. I tested both in isolation and discovered that the behavior was
consistent regardless of whether a trailing newline was included. I
further confirmed in code that wwlog appends a trailing newline
automatically if it is not present; so a trailing newline is unnecessary
in individual calls.

This commit removes trailing newlines from all calls to make them
consistent. It also replaces two calls to wwlog.Printf. (see #534)

Signed-off-by: Jonathon Anderson <janderson@ciq.co>
This commit is contained in:
Jonathon Anderson
2022-09-15 12:38:03 -06:00
parent fc39209fbb
commit 0b3e862bea
58 changed files with 327 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
internal/app/wwctl/kernel/delete/main.go
View File

@@ -14,7 +14,7 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
nodeDB, err := node.New()
if err != nil {
wwlog.Error("Could not open nodeDB: %s\n", err)
wwlog.Error("Could not open nodeDB: %s", err)
os.Exit(1)
}
@@ -24,14 +24,14 @@ ARG_LOOP:
for _, arg := range args {
for _, n := range nodes {
if n.Kernel.Override.Get() == arg {
wwlog.Error("Kernel is configured for nodes, skipping: %s\n", arg)
wwlog.Error("Kernel is configured for nodes, skipping: %s", arg)
continue ARG_LOOP
}
}
err := kernel.DeleteKernel(arg)
if err != nil {
wwlog.Error("Could not delete kernel: %s\n", arg)
wwlog.Error("Could not delete kernel: %s", arg)
} else {
fmt.Printf("Kernel has been deleted: %s\n", arg)
}

10
internal/app/wwctl/kernel/imprt/main.go
View File

@@ -39,7 +39,7 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
} else {
kernelVersion, err = kernel.FindKernelVersion(OptRoot)
if err != nil {
wwlog.Error("could not detect kernel under %s\n", OptRoot)
wwlog.Error("could not detect kernel under %s", OptRoot)
os.Exit(1)
}
}
@@ -51,7 +51,7 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
}
output, err := kernel.Build(kernelVersion, kernelName, OptRoot)
if err != nil {
wwlog.Error("Failed building kernel: %s\n", err)
wwlog.Error("Failed building kernel: %s", err)
os.Exit(1)
} else {
fmt.Printf("%s: %s\n", kernelName, output)
@@ -61,15 +61,15 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
nodeDB, err := node.New()
if err != nil {
wwlog.Error("Could not open node configuration: %s\n", err)
wwlog.Error("Could not open node configuration: %s", err)
os.Exit(1)
}
//TODO: Don't loop through profiles, instead have a nodeDB function that goes directly to the map
profiles, _ := nodeDB.FindAllProfiles()
for _, profile := range profiles {
wwlog.Debug("Looking for profile default: %s\n", profile.Id.Get())
wwlog.Debug("Looking for profile default: %s", profile.Id.Get())
if profile.Id.Get() == "default" {
wwlog.Debug("Found profile default, setting kernel version to: %s\n", args[0])
wwlog.Debug("Found profile default, setting kernel version to: %s", args[0])
profile.Kernel.Override.Set(args[0])
err := nodeDB.ProfileUpdate(profile)
if err != nil {

2
internal/app/wwctl/kernel/list/main.go
View File

@@ -14,7 +14,7 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
kernels, err := kernel.ListKernels()
if err != nil {
wwlog.Error("%s\n", err)
wwlog.Error("%s", err)
os.Exit(1)
}