extern/podman-compose
1
0
Fork 1
mirror of https://github.com/containers/podman-compose.git synced 2025-08-18 17:38:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Hide stack trace shown on YAML parse error by default

Browse Source 
Fixes https://github.com/containers/podman-compose/issues/1139

Signed-off-by: Yusuke Matsubara <whym@whym.org>
This commit is contained in:
Yusuke Matsubara
2025-06-26 20:45:00 +09:00
committed by Povilas Kanapickas
parent b06224389e
commit 764efd360c
5 changed files with 87 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
podman_compose.py
View File

@@ -1904,6 +1904,15 @@ def rec_merge(target: dict[str, Any], *sources: dict[str, Any]) -> dict[str, Any
return ret
def load_yaml_or_die(file_path: str, stream: Any) -> dict[str, Any]:
try:
return yaml.safe_load(stream)
except yaml.scanner.ScannerError as e:
log.fatal("Compose file contains an error:\n%s", e)
log.info("Compose file %s contains an error:", file_path, exc_info=e)
sys.exit(1)
def resolve_extends(
services: dict[str, Any], service_names: list[str], environ: dict[str, Any]
) -> None:
@@ -1920,7 +1929,7 @@ def resolve_extends(
if filename.startswith("./"):
filename = filename[2:]
with open(filename, "r", encoding="utf-8") as f:
content = yaml.safe_load(f) or {}
content = load_yaml_or_die(filename, f) or {}
if "services" in content:
content = content["services"]
subdirectory = os.path.dirname(filename)
@@ -2229,10 +2238,10 @@ class PodmanCompose:
break
if filename.strip().split('/')[-1] == '-':
content = yaml.safe_load(sys.stdin)
content = load_yaml_or_die(filename, sys.stdin)
else:
with open(filename, "r", encoding="utf-8") as f:
content = yaml.safe_load(f)
content = load_yaml_or_die(filename, f)
# log(filename, json.dumps(content, indent = 2))
if not isinstance(content, dict):
sys.stderr.write(