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

10
internal/app/wwctl/profile/delete/main.go
View File

@@ -16,13 +16,13 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
nodeDB, err := node.New()
if err != nil {
wwlog.Error("Failed to open node database: %s\n", err)
wwlog.Error("Failed to open node database: %s", err)
os.Exit(1)
}
profiles, err := nodeDB.FindAllProfiles()
if err != nil {
wwlog.Error("Could not load all profiles: %s\n", err)
wwlog.Error("Could not load all profiles: %s", err)
os.Exit(1)
}
@@ -31,13 +31,13 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
if p.Id.Get() == r {
nodes, err := nodeDB.FindAllNodes()
if err != nil {
wwlog.Error("Could not load all nodes: %s\n", err)
wwlog.Error("Could not load all nodes: %s", err)
os.Exit(1)
}
for _, n := range nodes {
for _, np := range n.Profiles.GetSlice() {
if np == r {
wwlog.Verbose("Removing profile from node %s: %s\n", n.Id.Get(), r)
wwlog.Verbose("Removing profile from node %s: %s", n.Id.Get(), r)
n.Profiles.SliceRemoveElement(r)
err := nodeDB.NodeUpdate(n)
if err != nil {
@@ -58,7 +58,7 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
found = true
err := nodeDB.DelProfile(r)
if err != nil {
wwlog.Error("%s\n", err)
wwlog.Error("%s", err)
}
}
}