From: Forrest Voight <forrest.voight@gmail.com>
Date: Thu, 26 Jan 2012 22:20:16 +0000 (-0500)
Subject: reformatted conf file error message, including a randomly generated password
X-Git-Tag: 0.8.3~54
X-Git-Url: https://git.novaco.in/?a=commitdiff_plain;h=88da5bff664a49d3eb682952d2caa7685ad90393;p=p2pool.git

reformatted conf file error message, including a randomly generated password
---

diff --git a/p2pool/main.py b/p2pool/main.py
index 8f2e990..b282531 100644
--- a/p2pool/main.py
+++ b/p2pool/main.py
@@ -950,10 +950,10 @@ def run():
         conf_path = net.CONF_FILE_FUNC()
         if not os.path.exists(conf_path):
             parser.error('''Bitcoin configuration file not found. Manually enter your RPC password.\r\n'''
-                '''If you actually haven't created a configuration file, you should create\r\n'''
-                '''one at %s with the text:\r\n'''
-                '''|    server=true\r\n'''
-                '''|    rpcpassword=<A LONG RANDOM PASSWORD THAT YOU DON'T HAVE TO REMEMBER>''' % (net.CONF_FILE_FUNC(),))
+                '''If you actually haven't created a configuration file, you should create one at %s with the text:\r\n'''
+                '''\r\n'''
+                '''server=true\r\n'''
+                '''rpcpassword=%x # (randomly generated for your convenience)''' % (conf_path, random.randrange(2**128)))
         with open(conf_path, 'rb') as f:
             cp = ConfigParser.RawConfigParser()
             cp.readfp(StringIO.StringIO('[x]\r\n' + f.read()))