Moved try/exception in the main function

d542495d · Nicolas Chevillot · daacc1b9 · d542495d
Commit d542495d authored Apr 30, 2019 by Nicolas Chevillot
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 13 deletions

__main__.py hdlmake/__main__.py +14 -13

No files found.
--- a/hdlmake/__main__.py
+++ b/hdlmake/__main__.py
@@ -26,6 +26,7 @@ from __future__ import print_function
 from __future__ import absolute_import
 import argparse
 import sys
+import logging

 from .manifest_parser import ManifestParser
 from .module_pool import ModulePool
@@ -50,11 +51,19 @@ def main():
    #
    options = _get_options(sys, parser)

-    # Create a ModulePool object, this will become our workspace
-    modules_pool = ModulePool(options)
+    try:
+        # Create a ModulePool object, this will become our workspace
+        modules_pool = ModulePool(options)

-    # Execute the appropriated action for the freshly created modules pool
-    _action_runner(modules_pool)
+        # Execute the appropriated action for the freshly created modules pool
+        _action_runner(modules_pool)
+    except Exception as e:
+        import traceback
+        logging.error(e)
+        if options.full_error:
+            logging.error("Trace:")
+            traceback.print_exc()
+        quit(2)


 def _action_runner(modules_pool):
@@ -210,12 +219,4 @@ def _get_options(sys_aux, parser):


 if __name__ == "__main__":
-    try:
-        main()
-    except Exception as e:
-        import traceback
-        logging.error(e)
-        if global_mod.options.full_error:
-            logging.error("Trace:")
-            traceback.print_exc()
-        quit(2)
+    main()