diff options
| author | Eric Biggers <ebiggers@google.com> | 2020-01-28 01:58:51 -0800 |
|---|---|---|
| committer | Joseph Richey <joerichey@google.com> | 2020-01-28 01:58:51 -0800 |
| commit | 9927ab8426e765db8de304e9f99ba5c520b5018c (patch) | |
| tree | 3dce106a0949a24f75dd9b8b0bfa1df293cc96e1 /cmd/fscrypt/errors.go | |
| parent | 2c57ab18375a8d0b4df9c4b6d9f3692d14edfee7 (diff) | |
cmd/fscrypt/errors: explicitly mark error messages as errors (#191)
When an fscrypt command fails and prints an error message, in some cases
it isn't clear that the message is actually an error, e.g.:
fscrypt encrypt: login protectors do not need a name
Make it clear by always prefixing the message with "[ERROR] ", e.g.
[ERROR] fscrypt encrypt: login protectors do not need a name
Update https://github.com/google/fscrypt/issues/186
Diffstat (limited to 'cmd/fscrypt/errors.go')
| -rw-r--r-- | cmd/fscrypt/errors.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cmd/fscrypt/errors.go b/cmd/fscrypt/errors.go index 5239155..bef6c2a 100644 --- a/cmd/fscrypt/errors.go +++ b/cmd/fscrypt/errors.go @@ -169,12 +169,12 @@ func getErrorSuggestions(err error) string { } // newExitError creates a new error for a given context and normal error. The -// returned error prepends the name of the relevant command and will make -// fscrypt return a non-zero exit value. +// returned error prepends an error tag and the name of the relevant command, +// and it will make fscrypt return a non-zero exit value. func newExitError(c *cli.Context, err error) error { - // Prepend the full name and append suggestions (if any) - fullNamePrefix := getFullName(c) + ": " - message := fullNamePrefix + wrapText(err.Error(), utf8.RuneCountInString(fullNamePrefix)) + // Prepend the error tag and full name, and append suggestions (if any) + prefix := "[ERROR] " + getFullName(c) + ": " + message := prefix + wrapText(err.Error(), utf8.RuneCountInString(prefix)) if suggestion := getErrorSuggestions(err); suggestion != "" { message += "\n\n" + wrapText(suggestion, 0) |