Move all except clauses to the run_and_combine_outputs function

Author: jluethi

jgo/jgo.py

@@ -197,22 +197,38 @@ def launch_java(
     return subprocess.run((java, '-cp', cp) + jvm_args + (main_class,) + app_args, stdout=stdout, stderr=stderr, **subprocess_run_kwargs)
 
 def run_and_combine_outputs(command, *args):
-    try:
-        return subprocess.check_output((command,) + args, stderr=subprocess.STDOUT)
-    except subprocess.CalledProcessError as e:
-        _logger.error("Error in `%s': %d", ' '.join(e.cmd), e.returncode)
-        _logger.debug("Exception: %s", e)
-        _logger.debug("Debug Trace:", exc_info=True)
-        if e.stdout:
-            _logger.debug("\tstd out:")
-            for l in str(e.stdout).split('\\n'):
-                _logger.debug('\t\t%s', l)
-        if e.stderr:
-            _logger.debug("\tstd err:")
-            for l in str(e.stderr).split('\\n'):
-                _logger.debug('\t\t%s', l)
-        # parser.print_help(file=sys.stderr)
-        sys.exit(e.returncode)
+	try:
+		return subprocess.check_output((command,) + args, stderr=subprocess.STDOUT)
+	except subprocess.CalledProcessError as e:
+		_logger.error("Error in `%s': %d", ' '.join(e.cmd), e.returncode)
+		_logger.debug("Exception: %s", e)
+		_logger.debug("Debug Trace:", exc_info=True)
+		if e.stdout:
+			_logger.debug("\tstd out:")
+			for l in str(e.stdout).split('\\n'):
+				_logger.debug('\t\t%s', l)
+		if e.stderr:
+			_logger.debug("\tstd err:")
+			for l in str(e.stderr).split('\\n'):
+				_logger.debug('\t\t%s', l)
+		# parser.print_help(file=sys.stderr)
+		sys.exit(e.returncode)
+		
+	except NoMainClassInManifest as e:
+		_logger.error(e)
+		_logger.error("No main class given, and none found.")
+		# parser.print_help(file=sys.stderr)
+		sys.exit(1)
+
+	except HelpRequested as e:
+		pass
+		#parser.parse_known_args(e.argv)
+
+	except Exception as e:
+		_logger.error(e)
+		traceback.print_tb(e.__traceback__)
+		parser.print_help(file=sys.stderr)
+		sys.exit(1)
 
 def find_endpoint(argv, shortcuts={}):
     # endpoint is first positional argument
@@ -271,21 +287,6 @@ def jgo_main(argv=sys.argv[1:], stdout=None, stderr=None):
     completed_process = run(parser, argv=argv, stdout=stdout, stderr=stderr)
     completed_process.check_returncode()
 
-    except NoMainClassInManifest as e:
-        _logger.error(e)
-        _logger.error("No main class given, and none found.")
-        parser.print_help(file=sys.stderr)
-        sys.exit(1)
-
-    except HelpRequested as e:
-        parser.parse_known_args(e.argv)
-
-    except Exception as e:
-        _logger.error(e)
-        traceback.print_tb(e.__traceback__)
-        parser.print_help(file=sys.stderr)
-        sys.exit(1)
-
 
 def jgo_cache_dir_environment_variable():
     return 'JGO_CACHE_DIR'