shithub: hugo

Info  •  Files  •  Log  •  Branches

Fix some errors with format patterns

See #1502

--- a/commands/hugo.go

+++ b/commands/hugo.go

@@ -57,12 +57,20 @@

 	return u.userError

 }

-func newUserError(messages ...interface{}) commandError {

-	return commandError{s: fmt.Sprintln(messages...), userError: true}

+func newUserError(a ...interface{}) commandError {

+	return commandError{s: fmt.Sprintln(a...), userError: true}

 }

-func newSystemError(messages ...interface{}) commandError {

-	return commandError{s: fmt.Sprintln(messages...), userError: false}

+func newUserErrorF(format string, a ...interface{}) commandError {

+	return commandError{s: fmt.Sprintf(format, a...), userError: true}

+}

+

+func newSystemError(a ...interface{}) commandError {

+	return commandError{s: fmt.Sprintln(a...), userError: false}

+}

+

+func newSystemErrorF(format string, a ...interface{}) commandError {

+	return commandError{s: fmt.Sprintf(format, a...), userError: false}

 }

 // catch some of the obvious user errors from Cobra.

--- a/commands/undraft.go

+++ b/commands/undraft.go

@@ -59,17 +59,17 @@

 	w, err := undraftContent(p)

 	if err != nil {

-		return newSystemError("an error occurred while undrafting %q: %s", location, err)

+		return newSystemErrorF("an error occurred while undrafting %q: %s", location, err)

 	}

 	f, err = os.OpenFile(location, os.O_WRONLY|os.O_TRUNC, 0644)

 	if err != nil {

-		return newSystemError("%q not be undrafted due to error opening file to save changes: %q\n", location, err)

+		return newSystemErrorF("%q not be undrafted due to error opening file to save changes: %q\n", location, err)

 	}

 	defer f.Close()

 	_, err = w.WriteTo(f)

 	if err != nil {

-		return newSystemError("%q not be undrafted due to save error: %q\n", location, err)

+		return newSystemErrorF("%q not be undrafted due to save error: %q\n", location, err)

 	}

 	return nil

 }