Improve handling of missing or broken mapping cores

Author: olofk

fusesoc/coremanager.py

@@ -178,7 +178,9 @@ def mapping_set(self, mapping_vlnvs: Iterable[str]) -> None:
             new_mapping_name = str(Vlnv(mapping_vlnv))
             new_mapping_core = self._cores.get(new_mapping_name)
             if not new_mapping_core:
-                raise RuntimeError(f"The core '{mapping_vlnv}' wasn't found.")
+                raise RuntimeError(
+                    f"Requested mapping core '{mapping_vlnv}' wasn't found."
+                )
 
             new_mapping_raw = new_mapping_core["core"].mapping
             if not new_mapping_raw:

fusesoc/main.py

@@ -327,7 +327,11 @@ def run(fs, args):
         else:
             flags[flag] = True
 
-    fs.cm.db.mapping_set(args.mapping)
+    try:
+        fs.cm.db.mapping_set(args.mapping)
+    except RuntimeError as e:
+        logger.error(e)
+        exit(1)
 
     if args.lockfile is not None:
         try: