Browse Source

Minor fixes

MMGen 7 years ago
parent
commit
9b109fec58
2 changed files with 6 additions and 6 deletions
  1. 5 5
      mmgen/main.py
  2. 1 1
      mmgen/regtest.py

+ 5 - 5
mmgen/main.py

@@ -55,9 +55,9 @@ def launch(what):
 			if os.getenv('MMGEN_TRACEBACK'):
 				raise
 			else:
-				try: m = u'{}\n'.format(e[0])
+				try: m = u'{}'.format(e[0])
 				except:
-					try: m = u'{!r}\n'.format(e[0])
-					except: m = u'{!r}\n'.format(e)
-				sys.stderr.write(u'ERROR: ' + m)
-				sys.exit(2)
+					try: m = u'{!r}'.format(e[0])
+					except: m = u'{!r}'.format(e)
+				from mmgen.util import ydie
+				ydie(2,u'\nERROR: ' + m)

+ 1 - 1
mmgen/regtest.py

@@ -242,7 +242,7 @@ def get_current_user_win(quiet=False):
 	return None
 
 def get_current_user_unix(quiet=False):
-	p = start_cmd('pgrep','-af','{}.*--rpcport={}.*'.format(g.proto.daemon_name,rpc_port))
+	p = start_cmd('pgrep','-af','{}.*--rpcport={}.*'.format(g.proto.daemon_name,rpc_port),quiet=True)
 	cmdline = p.stdout.read()
 	if not cmdline: return None
 	for k in ('miner','bob','alice'):