Merge branch 'master' of git://github.com/spesmilo/electrum

This commit is contained in:
ThomasV 2014-05-24 22:06:48 +02:00
commit 13fa81a90e
1 changed files with 1 additions and 1 deletions

View File

@ -338,7 +338,7 @@ if __name__ == '__main__':
if cmd.name == 'importprivkey':
# See if they specificed a key on the cmd line, if not prompt
if len(args) == 1:
args[1] = prompt_password('Enter PrivateKey (will not echo):', False)
args.append(prompt_password('Enter PrivateKey (will not echo):', False))
elif cmd.name == 'signrawtransaction':
args = [cmd, args[1], json.loads(args[2]) if len(args) > 2 else [], json.loads(args[3]) if len(args) > 3 else []]