tMerge branch 'master' of git://github.com/spesmilo/electrum - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 13fa81a90efbc6fe72832257ddb083d19d3a18e9
DIR parent 0bd1eb1f7ad07c04fb6baefcc29912ea29416b21
HTML Author: ThomasV <thomasv@gitorious>
Date: Sat, 24 May 2014 22:06:48 +0200
Merge branch 'master' of git://github.com/spesmilo/electrum
Diffstat:
M electrum | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
DIR diff --git a/electrum b/electrum
t@@ -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 []]