particle-os/debian-forge
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

osbuild-mpp: Print better errors if eval fails

Browse source 
I'm trying to debug some failures, and having no feedback as to
what file we're parsing or what code is evaluated when something
fails makes it hard to debug manifests.

This adds some nice error messages that will help.
This commit is contained in:
Alexander Larsson 2023-11-28 16:08:19 +01:00 • committed by Simon de Vlieger
parent bc04bfc366
commit 677a874115
1 changed files with 21 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

24
tools/osbuild-mpp
View file

@ -1209,7 +1209,15 @@ class ManifestFile:
# pylint: disable=eval-used # yolo this is fine!
# Note, we copy local_vars here to avoid eval modifying it
if eval(code, dict(local_vars)):
res = False
try:
res = eval(code, dict(local_vars))
except Exception as e:
print(f"In {self.path}: Failed to evaluate mpp-if of:\n {code}")
print(f"Error: {e}")
sys.exit(1)
if res:
key = "then"
else:
key = "else"
@ -1223,7 +1231,12 @@ class ManifestFile:
# pylint: disable=eval-used # yolo this is fine!
# Note, we copy local_vars here to avoid eval modifying it
res = eval(code, dict(local_vars))
try:
res = eval(code, dict(local_vars))
except Exception as e:
print(f"In {self.path}: Failed to mpp-eval:\n {code}")
print(f"Error: {e}")
sys.exit(1)
return res, False
if "mpp-format-string" in node:
@ -1238,7 +1251,12 @@ class ManifestFile:
# pylint: disable=eval-used # yolo this is fine!
# Note, we copy local_vars here to avoid eval modifying it
res = eval(f'f\'\'\'{format_string}\'\'\'', dict(local_vars))
try:
res = eval(f'f\'\'\'{format_string}\'\'\'', dict(local_vars))
except Exception as e:
print(f"In {self.path}: Failed to format string:\n {format_string}")
print(f"Error: {e}")
sys.exit(1)
if res_type == "int":
res = int(res)