Fix nil error issue

google · Aug 1, 2020 · 1d3c051 · 1d3c051
1 parent 4f416bf
commit 1d3c051
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/cmd/fscrypt/commands.go b/cmd/fscrypt/commands.go
@@ -992,7 +992,7 @@ func addProtectorAction(c *cli.Context) error {
 		return newExitError(c, err)
 	}
 	// Sanity check before unlocking everything
-	if err := policy.AddProtector(protector); errors.Cause(err) != actions.ErrLocked {
+	if err := policy.AddProtector(protector); err != nil && errors.Cause(err) != actions.ErrLocked {
 		return newExitError(c, err)
 	}
 

diff --git a/cmd/fscrypt/errors.go b/cmd/fscrypt/errors.go
@@ -287,10 +287,6 @@ func getErrorSuggestions(err error) string {
 // 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 {
-	if err == nil {
-		return nil
-	}
-
 	// Prepend the error tag and full name, and append suggestions (if any)
 	prefix := "[ERROR] " + getFullName(c) + ": "
 	message := prefix + wrapText(err.Error(), utf8.RuneCountInString(prefix))