From 9b109fec58bb231ba8eb5c64b5d9b3cbb49645e4 Mon Sep 17 00:00:00 2001 From: MMGen Date: Tue, 6 Mar 2018 07:26:41 +0000 Subject: [PATCH] Minor fixes --- mmgen/main.py | 10 +++++----- mmgen/regtest.py | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mmgen/main.py b/mmgen/main.py index 724b7ad3..ad694685 100755 --- a/mmgen/main.py +++ b/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) diff --git a/mmgen/regtest.py b/mmgen/regtest.py index 5b0e6491..bdb1af4d 100755 --- a/mmgen/regtest.py +++ b/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'):