summaryrefslogtreecommitdiffstats
path: root/cmd/commands/user.go
diff options
context:
space:
mode:
authorDerrick Anderson <derrick@andersonwebstudio.com>2018-05-15 11:54:24 -0400
committerDerrick Anderson <derrick@andersonwebstudio.com>2018-05-15 11:54:24 -0400
commitfbbe1f7cefd52a27fd52893509b5365d275f9bee (patch)
tree5dae4ebc13fca2749b4278bba772ec13c0924e03 /cmd/commands/user.go
parenta1656dffa98fbc8865e476b214e4e0c562547d39 (diff)
parent228bc4bd1dc84bf741978711b680a06dd9d67613 (diff)
downloadchat-fbbe1f7cefd52a27fd52893509b5365d275f9bee.tar.gz
chat-fbbe1f7cefd52a27fd52893509b5365d275f9bee.tar.bz2
chat-fbbe1f7cefd52a27fd52893509b5365d275f9bee.zip
Merge branch 'merge410rc5'
Diffstat (limited to 'cmd/commands/user.go')
-rw-r--r--cmd/commands/user.go6
1 files changed, 5 insertions, 1 deletions
diff --git a/cmd/commands/user.go b/cmd/commands/user.go
index da3fb454b..7397cfb2e 100644
--- a/cmd/commands/user.go
+++ b/cmd/commands/user.go
@@ -422,6 +422,10 @@ func updateUserEmailCmdF(command *cobra.Command, args []string) error {
}
defer a.Shutdown()
+ if len(args) != 2 {
+ return errors.New("Expected two arguments. See help text for details.")
+ }
+
newEmail := args[1]
if !model.IsValidEmail(newEmail) {
@@ -440,7 +444,7 @@ func updateUserEmailCmdF(command *cobra.Command, args []string) error {
user.Email = newEmail
_, errUpdate := a.UpdateUser(user, true)
if errUpdate != nil {
- return errUpdate
+ return errors.New(errUpdate.Message)
}
return nil