zerica/hugo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix some errors with format patterns

Browse Source 
See #1502
This commit is contained in:
Bjørn Erik Pedersen 2015-12-02 23:37:40 +01:00
parent f363faadab
commit be28d9d943
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
commands/hugo.go
View File

@ -57,12 +57,20 @@ func (u commandError) isUserError() bool {
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.

6
commands/undraft.go
View File

@ -59,17 +59,17 @@ func Undraft(cmd *cobra.Command, args []string) error {
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
}