input: fix layers error messages

There were some remnants of the removed nested layers when generating error messages. Addendum to 6f84d58. Co-authored-by: Ralf Hubert <[email protected]>
BobBuildTool · Oct 21, 2024 · 73bde4a · 73bde4a
1 parent c44dfd8
commit 73bde4a
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/pym/bob/input.py b/pym/bob/input.py
@@ -2032,7 +2032,7 @@ def __init__(self, recipeSet, recipe, layer, sourceFile, baseDir, packageName, b
         self.__layer = layer
 
         sourceName = ("Recipe " if isRecipe else "Class  ") + packageName + (
-            ", layer "+"/".join(layer) if layer else "")
+            ", layer "+ layer if layer else "")
         incHelperBash = IncludeHelper(BashLanguage, recipeSet.loadBinary,
                                       baseDir, packageName, sourceName).resolve
         incHelperPwsh = IncludeHelper(PwshLanguage, recipeSet.loadBinary,
@@ -3567,7 +3567,7 @@ def __parseLayer(self, layerSpec, maxVer, recipesRoot):
         minVer = config.get("bobMinimumVersion", "0.16")
         if compareVersion(maxVer, minVer) < 0:
             raise ParseError("Layer '{}' requires a higher Bob version than root project!"
-                                .format("/".join(layer)))
+                                .format(layer))
         maxVer = minVer # sub-layers must not have a higher bobMinimumVersion
 
         # Determine policies. The root layer determines the default settings
@@ -3577,7 +3577,7 @@ def __parseLayer(self, layerSpec, maxVer, recipesRoot):
             for (name, behaviour) in config.get("policies", {}).items():
                 if bool(self.__policies[name][0]) != behaviour:
                     raise ParseError("Layer '{}' requires different behaviour for policy '{}' than root project!"
-                                        .format("/".join(layer), name))
+                                        .format(layer, name))
         else:
             self.__policies = self.calculatePolicies(config)