Commit f7ab4431 authored by Sasha Goldshtein's avatar Sasha Goldshtein

argdist: Exit with nonzero return code on error

parent d11179d8
...@@ -637,7 +637,7 @@ argdist -p 2780 -z 120 \\ ...@@ -637,7 +637,7 @@ argdist -p 2780 -z 120 \\
self.probes.append(Probe(self, "hist", histspecifier)) self.probes.append(Probe(self, "hist", histspecifier))
if len(self.probes) == 0: if len(self.probes) == 0:
print("at least one specifier is required") print("at least one specifier is required")
exit() exit(1)
def _generate_program(self): def _generate_program(self):
bpf_source = """ bpf_source = """
...@@ -695,10 +695,13 @@ struct __string_t { char s[%d]; }; ...@@ -695,10 +695,13 @@ struct __string_t { char s[%d]; };
self._attach() self._attach()
self._main_loop() self._main_loop()
except: except:
exc_info = sys.exc_info()
sys_exit = exc_info[0] is SystemExit
if self.args.verbose: if self.args.verbose:
traceback.print_exc() traceback.print_exc()
elif sys.exc_info()[0] is not SystemExit: elif not sys_exit:
print(sys.exc_info()[1]) print(exc_info[1])
exit(0 if sys_exit else 1)
if __name__ == "__main__": if __name__ == "__main__":
Tool().run() Tool().run()
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment