templates
/
KiBot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unified some *dont_stop* cases

This commit is contained in:
Salvador E. Tropea 2024-01-05 13:18:03 -03:00
parent 393f45fe54
commit 2ba5b7101c
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kibot/gs.py
View File

@ -796,7 +796,8 @@ class GS(object):
for h in hints: for h in hints:
if h[0] in out: if h[0] in out:
logger.error(h[1]) logger.error(h[1])
exit(level) if level >= 0:
exit(level)
@staticmethod @staticmethod
def get_shape(shape): def get_shape(shape):

12
kibot/kiplot.py
View File

@ -24,7 +24,7 @@ from .misc import (PLOT_ERROR, CORRUPTED_PCB, EXIT_BAD_ARGS, CORRUPTED_SCH, vers
EXIT_BAD_CONFIG, WRONG_INSTALL, UI_SMD, UI_VIRTUAL, TRY_INSTALL_CHECK, MOD_SMD, MOD_THROUGH_HOLE, EXIT_BAD_CONFIG, WRONG_INSTALL, UI_SMD, UI_VIRTUAL, TRY_INSTALL_CHECK, MOD_SMD, MOD_THROUGH_HOLE,
MOD_VIRTUAL, W_PCBNOSCH, W_NONEEDSKIP, W_WRONGCHAR, name2make, W_TIMEOUT, W_KIAUTO, W_VARSCH, MOD_VIRTUAL, W_PCBNOSCH, W_NONEEDSKIP, W_WRONGCHAR, name2make, W_TIMEOUT, W_KIAUTO, W_VARSCH,
NO_SCH_FILE, NO_PCB_FILE, W_VARPCB, NO_YAML_MODULE, WRONG_ARGUMENTS, FAILED_EXECUTE, W_VALMISMATCH, NO_SCH_FILE, NO_PCB_FILE, W_VARPCB, NO_YAML_MODULE, WRONG_ARGUMENTS, FAILED_EXECUTE, W_VALMISMATCH,
MOD_EXCLUDE_FROM_POS_FILES, MOD_EXCLUDE_FROM_BOM, MOD_BOARD_ONLY, hide_stderr, W_MAXDEPTH) MOD_EXCLUDE_FROM_POS_FILES, MOD_EXCLUDE_FROM_BOM, MOD_BOARD_ONLY, hide_stderr, W_MAXDEPTH, DONT_STOP)
from .error import PlotError, KiPlotConfigurationError, config_error, KiPlotError from .error import PlotError, KiPlotConfigurationError, config_error, KiPlotError
from .config_reader import CfgYamlReader from .config_reader import CfgYamlReader
from .pre_base import BasePreFlight from .pre_base import BasePreFlight
@ -454,10 +454,7 @@ def config_output(out, dry=False, dont_stop=False):
out.config(None) out.config(None)
except KiPlotConfigurationError as e: except KiPlotConfigurationError as e:
msg = "In section '"+out.name+"' ("+out.type+"): "+str(e) msg = "In section '"+out.name+"' ("+out.type+"): "+str(e)
if dont_stop: GS.exit_with_error(msg, DONT_STOP if dont_stop else EXIT_BAD_CONFIG)
logger.error(msg)
else:
config_error(msg)
ok = False ok = False
except SystemExit: except SystemExit:
if not dont_stop: if not dont_stop:
@ -497,10 +494,7 @@ def run_output(out, dont_stop=False):
config_error(msg) config_error(msg)
except (PlotError, KiPlotError) as e: except (PlotError, KiPlotError) as e:
msg = "In output `"+str(out)+"`: "+str(e) msg = "In output `"+str(out)+"`: "+str(e)
if dont_stop: GS.exit_with_error(msg, DONT_STOP if dont_stop else PLOT_ERROR)
logger.error(msg)
else:
GS.exit_with_error(msg, PLOT_ERROR)
except KiConfError as e: except KiConfError as e:
ki_conf_error(e) ki_conf_error(e)
except SystemExit: except SystemExit:

1
kibot/misc.py
View File

@ -11,6 +11,7 @@ from contextlib import contextmanager
# Error levels # Error levels
DONT_STOP = -1 # Keep going
INTERNAL_ERROR = 1 # Unhandled exceptions INTERNAL_ERROR = 1 # Unhandled exceptions
WRONG_ARGUMENTS = 2 # This is what argsparse uses WRONG_ARGUMENTS = 2 # This is what argsparse uses
UNSUPPORTED_OPTION = 3 UNSUPPORTED_OPTION = 3