tMerge branch 'master' of git://gitorious.org/electrum/electrum - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 07bac3b65e946d905ca1ea952768d4b3f8402baa
DIR parent f4d4962b1d23f42a7c6bb6d489602661ede89560
HTML Author: thomasv <thomasv@gitorious>
Date: Wed, 8 Feb 2012 16:23:34 +0100
Merge branch 'master' of git://gitorious.org/electrum/electrum
Diffstat:
M server/server.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
---
DIR diff --git a/server/server.py b/server/server.py
t@@ -717,6 +717,8 @@ if __name__ == '__main__':
out = server.blockchain.transaction.broadcast(sys.argv[2])
elif cmd == 'b':
out = server.blocks()
+ else:
+ out = "Unknown command: '%s'" % cmd
print out
sys.exit(0)
t@@ -751,10 +753,10 @@ if __name__ == '__main__':
block_number = store.get_block_number(1)
except IOError:
print "IOError: cannot reach bitcoind"
- block_number = -1
+ block_number = 0
except:
traceback.print_exc(file=sys.stdout)
- block_number = -1
+ block_number = 0
finally:
dblock.release()
time.sleep(10)