Merge branch 'master' of git://gitorious.org/electrum/electrum
This commit is contained in:
commit
07bac3b65e
|
@ -717,6 +717,8 @@ if __name__ == '__main__':
|
||||||
out = server.blockchain.transaction.broadcast(sys.argv[2])
|
out = server.blockchain.transaction.broadcast(sys.argv[2])
|
||||||
elif cmd == 'b':
|
elif cmd == 'b':
|
||||||
out = server.blocks()
|
out = server.blocks()
|
||||||
|
else:
|
||||||
|
out = "Unknown command: '%s'" % cmd
|
||||||
print out
|
print out
|
||||||
sys.exit(0)
|
sys.exit(0)
|
||||||
|
|
||||||
|
@ -751,10 +753,10 @@ if __name__ == '__main__':
|
||||||
block_number = store.get_block_number(1)
|
block_number = store.get_block_number(1)
|
||||||
except IOError:
|
except IOError:
|
||||||
print "IOError: cannot reach bitcoind"
|
print "IOError: cannot reach bitcoind"
|
||||||
block_number = -1
|
block_number = 0
|
||||||
except:
|
except:
|
||||||
traceback.print_exc(file=sys.stdout)
|
traceback.print_exc(file=sys.stdout)
|
||||||
block_number = -1
|
block_number = 0
|
||||||
finally:
|
finally:
|
||||||
dblock.release()
|
dblock.release()
|
||||||
time.sleep(10)
|
time.sleep(10)
|
||||||
|
|
Loading…
Reference in New Issue