From 10333fa8bade3f025639d050a5a4fd544a58e9e1 Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl@redhat.com>
Date: Thu, 18 Nov 2021 10:11:29 +0100
Subject: [PATCH] osbuild-mpp: Report the path of the json file when parsing
 fails

This makes it a lot easier to understand failures when files are
including other files.
---
 tools/osbuild-mpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tools/osbuild-mpp b/tools/osbuild-mpp
index 925b478a..966ff8ee 100755
--- a/tools/osbuild-mpp
+++ b/tools/osbuild-mpp
@@ -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: