All extensions that use Info extension should catch RuntimeError

17451k · Sep 19, 2018 · 5c432e2 · 5c432e2
1 parent 669b3ab
commit 5c432e2
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 10 deletions.
diff --git a/clade/extensions/callgraph.py b/clade/extensions/callgraph.py
@@ -353,5 +353,8 @@ def _clean_error_log(self):
 def parse(args=sys.argv[1:]):
     conf = parse_args(args)
 
-    c = Callgraph(conf["work_dir"], conf=conf)
-    c.parse(conf["cmds_file"])
+    try:
+        c = Callgraph(conf["work_dir"], conf=conf)
+        c.parse(conf["cmds_file"])
+    except RuntimeError as e:
+        raise SystemExit(e)
diff --git a/clade/extensions/functions.py b/clade/extensions/functions.py
@@ -181,5 +181,8 @@ def __group_functions_by_file(self):
 def parse(args=sys.argv[1:]):
     conf = parse_args(args)
 
-    c = Functions(conf["work_dir"], conf=conf)
-    c.parse(conf["cmds_file"])
+    try:
+        c = Functions(conf["work_dir"], conf=conf)
+        c.parse(conf["cmds_file"])
+    except RuntimeError as e:
+        raise SystemExit(e)
diff --git a/clade/extensions/macros.py b/clade/extensions/macros.py
@@ -108,5 +108,8 @@ def load_macros_expansions(self, files=None):
 def parse(args=sys.argv[1:]):
     conf = parse_args(args)
 
-    c = Macros(conf["work_dir"], conf=conf)
-    c.parse(conf["cmds_file"])
+    try:
+        c = Macros(conf["work_dir"], conf=conf)
+        c.parse(conf["cmds_file"])
+    except RuntimeError as e:
+        raise SystemExit(e)
diff --git a/clade/extensions/typedefs.py b/clade/extensions/typedefs.py
@@ -69,5 +69,8 @@ def load_typedefs(self, files=None):
 def parse(args=sys.argv[1:]):
     conf = parse_args(args)
 
-    c = Typedefs(conf["work_dir"], conf=conf)
-    c.parse(conf["cmds_file"])
+    try:
+        c = Typedefs(conf["work_dir"], conf=conf)
+        c.parse(conf["cmds_file"])
+    except RuntimeError as e:
+        raise SystemExit(e)
diff --git a/clade/extensions/variables.py b/clade/extensions/variables.py
@@ -129,5 +129,8 @@ def load_used_in_vars(self):
 def parse(args=sys.argv[1:]):
     conf = parse_args(args)
 
-    c = Variables(conf["work_dir"], conf=conf)
-    c.parse(conf["cmds_file"])
+    try:
+        c = Variables(conf["work_dir"], conf=conf)
+        c.parse(conf["cmds_file"])
+    except RuntimeError as e:
+        raise SystemExit(e)