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

osbuild-mpp: Report the path of the json file when parsing fails

Browse source 
This makes it a lot easier to understand failures when files are
including other files.
This commit is contained in:
Alexander Larsson 2021-11-18 10:11:29 +01:00 • committed by Christian Kellner
parent d1ad772284
commit 10333fa8ba
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tools/osbuild-mpp
View file

@ -603,7 +603,11 @@ class ManifestFile:
@staticmethod
def load_from_fd(f, path, overrides, default_vars):
# We use OrderedDict to preserve key order (for python < 3.6)
data = json.load(f, object_pairs_hook=collections.OrderedDict)
try:
data = json.load(f, object_pairs_hook=collections.OrderedDict)
except json.decoder.JSONDecodeError as err:
print (f"Invalid json in \"{path}\": {err.msg} at line {err.lineno} (col {err.colno})")
sys.exit(1)
version = int(data.get("version", "1"))
if version == 1: