argdist: Exit with nonzero return code on error

e-dant · Feb 13, 2017 · f7ab443 · f7ab443
1 parent d11179d
commit f7ab443
Showing 1 changed file with 6 additions and 3 deletions.
diff --git 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()