From f7ab443176838f2ae758feb35d6b125de1154c24 Mon Sep 17 00:00:00 2001 From: Sasha Goldshtein Date: Mon, 13 Feb 2017 18:46:49 -0500 Subject: [PATCH] argdist: Exit with nonzero return code on error --- tools/argdist.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/argdist.py b/tools/argdist.py index f1b78493be36..61f8e0060f9e 100755 --- a/tools/argdist.py +++ b/tools/argdist.py @@ -637,7 +637,7 @@ def _create_probes(self): self.probes.append(Probe(self, "hist", histspecifier)) if len(self.probes) == 0: print("at least one specifier is required") - exit() + exit(1) def _generate_program(self): bpf_source = """ @@ -695,10 +695,13 @@ def run(self): self._attach() self._main_loop() except: + exc_info = sys.exc_info() + sys_exit = exc_info[0] is SystemExit if self.args.verbose: traceback.print_exc() - elif sys.exc_info()[0] is not SystemExit: - print(sys.exc_info()[1]) + elif not sys_exit: + print(exc_info[1]) + exit(0 if sys_exit else 1) if __name__ == "__main__": Tool().run()