Domob1812 namecoin id2 #409

Merged
Atheros1 merged 19 commits from domob1812-namecoin-id2 into master 2013-08-15 01:19:20 +02:00
Showing only changes of commit 25f0192fd6 - Show all commits

View File

@ -240,11 +240,10 @@ def ensureNamecoinOptions ():
shared.config.set (configSection, "namecoinrpctype", "namecoind") shared.config.set (configSection, "namecoinrpctype", "namecoind")
if not shared.config.has_option (configSection, "namecoinrpchost"): if not shared.config.has_option (configSection, "namecoinrpchost"):
shared.config.set (configSection, "namecoinrpchost", "localhost") shared.config.set (configSection, "namecoinrpchost", "localhost")
if not shared.config.has_option (configSection, "namecoinrpcport"):
shared.config.set (configSection, "namecoinrpcport", "8336")
hasUser = shared.config.has_option (configSection, "namecoinrpcuser") hasUser = shared.config.has_option (configSection, "namecoinrpcuser")
hasPass = shared.config.has_option (configSection, "namecoinrpcpassword") hasPass = shared.config.has_option (configSection, "namecoinrpcpassword")
hasPort = shared.config.has_option (configSection, "namecoinrpcport")
# Try to read user/password from .namecoin configuration file. # Try to read user/password from .namecoin configuration file.
try: try:
@ -269,6 +268,7 @@ def ensureNamecoinOptions ():
"namecoinrpcpassword", val) "namecoinrpcpassword", val)
if key == "rpcport": if key == "rpcport":
shared.namecoinDefaultRpcPort = val shared.namecoinDefaultRpcPort = val
# Will be set in config below anyway.
nmc.close () nmc.close ()
@ -278,3 +278,8 @@ def ensureNamecoinOptions ():
shared.config.set (configSection, "namecoinrpcuser", "") shared.config.set (configSection, "namecoinrpcuser", "")
if (not hasPass): if (not hasPass):
shared.config.set (configSection, "namecoinrpcpassword", "") shared.config.set (configSection, "namecoinrpcpassword", "")
# Set default port now, possibly to found value.
if (not hasPort):
shared.config.set (configSection, "namecoinrpcport",
shared.namecoinDefaultRpcPort)