From 754eb6f27402455932da4f6bd0997de55222834b Mon Sep 17 00:00:00 2001 From: MaXFeeD Date: Wed, 28 Jan 2026 03:40:37 +0300 Subject: [PATCH] Fixed Inner Core java folders, improved error handling --- src/icmtoolchain/build_config.py | 2 +- src/icmtoolchain/shell.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/icmtoolchain/build_config.py b/src/icmtoolchain/build_config.py index da4323b..6065532 100644 --- a/src/icmtoolchain/build_config.py +++ b/src/icmtoolchain/build_config.py @@ -107,8 +107,8 @@ class BuildConfig(MakeDataConfig): manifest_path = join(directory, "manifest") manifest = FileConfig(manifest_path, raise_non_existing=True) - manifest.delete_value("path") config.merge_config(manifest, exclusive_lists=True) + config.delete_value("path") return self.obtain_java_manifest_data(relative_path=relative_path, output_path=output_path, config=config) diff --git a/src/icmtoolchain/shell.py b/src/icmtoolchain/shell.py index 7f1cdf5..d5ecfab 100644 --- a/src/icmtoolchain/shell.py +++ b/src/icmtoolchain/shell.py @@ -893,7 +893,7 @@ def abort(*values: object, sep: Optional[str] = " ", code: int = 255, cause: Opt from traceback import print_exception buffer = StringIO() print_exception(cause.__class__, cause, cause.__traceback__, file=buffer) - pretty_error(*buffer.getvalue().rsplit("\n", 9)[1:-1], sep="\n") + pretty_error(*buffer.getvalue().rsplit("\n", 13)[1:-1], sep="\n") if len(values) != 0: pretty_print(UNICODE_BALLOT_X, style="class:print.failure", end=" ") pretty_print(*values, sep=sep, style="class:print.abort-message")