From a1f1c404c3a8c0d48b25602ef91581cb47677636 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= <peterke@gmail.com>
Date: Tue, 12 Apr 2016 18:01:37 +0300
Subject: [PATCH] cmd/utils: fix accounts merge error on console unlock
---
cmd/utils/jeth.go | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/cmd/utils/jeth.go b/cmd/utils/jeth.go
index 708d457c6..cccf1bcf8 100644
--- a/cmd/utils/jeth.go
+++ b/cmd/utils/jeth.go
@@ -76,10 +76,9 @@ func (self *Jeth) UnlockAccount(call otto.FunctionCall) (response otto.Value) {
if call.Argument(1).IsUndefined() || call.Argument(1).IsNull() {
fmt.Printf("Unlock account %s\n", account)
if input, err := Stdin.PasswordPrompt("Passphrase: "); err != nil {
- return otto.FalseValue()
- passwd, _ = otto.ToValue(input)
- } else {
throwJSExeception(err.Error())
+ } else {
+ passwd, _ = otto.ToValue(input)
}
} else {
if !call.Argument(1).IsString() {
--
GitLab