Skip to content

Commit 1f4902e

Browse files
neal-akpatscott
authored andcommitted
Stop printing error message on clean exit
1 parent c4fdeb1 commit 1f4902e

File tree

2 files changed

+19
-11
lines changed

2 files changed

+19
-11
lines changed

pippi

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,15 @@ def main(arguments):
4343
try:
4444
command(arguments[2:])
4545
except BaseException as err:
46-
print()
47-
print('Running pippi failed in '+command.__name__+' operation, due to error:')
48-
print(err)
49-
print()
50-
sys.exit()
46+
clean_exit = False
47+
if isinstance(err, SystemExit):
48+
clean_exit = True if err.code == 0 else clean_exit
49+
if not clean_exit:
50+
print()
51+
print('Running pippi failed in '+command.__name__+' operation, due to error:')
52+
print(err)
53+
print()
54+
sys.exit()
5155
if not command in [merge, pare]:
5256
print()
5357
print('Completed sucessfully.')
@@ -61,11 +65,15 @@ def main(arguments):
6165
try:
6266
command(arguments[1:])
6367
except BaseException as err:
64-
print()
65-
print('Running pippi failed in '+command.__name__+' operation.')
66-
print(err)
67-
print()
68-
sys.exit()
68+
clean_exit = False
69+
if isinstance(err, SystemExit):
70+
clean_exit = True if err.code == 0 else clean_exit
71+
if not clean_exit:
72+
print()
73+
print('Running pippi failed in '+command.__name__+' operation.')
74+
print(err)
75+
print()
76+
sys.exit()
6977
print()
7078
print('Completed sucessfully.')
7179
print()

pippi_read.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ def getChainData(filename, cut_all_invalid=None, requested_cols=None, assignment
278278
for i, column_name in enumerate(column_names):
279279
if column_name != '': print(" ", i, ":", column_name)
280280
print()
281-
quit()
281+
sys.exit(0)
282282

283283
# Identify any likelihood or multiplicity indicated by the labels.
284284
if labels:

0 commit comments

Comments
 (0)