diff options
Diffstat (limited to 'bitbake/lib/layerindexlib/cooker.py')
-rw-r--r-- | bitbake/lib/layerindexlib/cooker.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/bitbake/lib/layerindexlib/cooker.py b/bitbake/lib/layerindexlib/cooker.py index 65b23d087f..21ec438a22 100644 --- a/bitbake/lib/layerindexlib/cooker.py +++ b/bitbake/lib/layerindexlib/cooker.py | |||
@@ -4,6 +4,7 @@ | |||
4 | # | 4 | # |
5 | 5 | ||
6 | import logging | 6 | import logging |
7 | import os | ||
7 | 8 | ||
8 | from collections import defaultdict | 9 | from collections import defaultdict |
9 | 10 | ||
@@ -73,7 +74,7 @@ class CookerPlugin(layerindexlib.plugin.IndexPlugin): | |||
73 | d = self.layerindex.data | 74 | d = self.layerindex.data |
74 | 75 | ||
75 | if not branches: | 76 | if not branches: |
76 | raise LayerIndexFetchError("No branches specified for _load_bblayers!") | 77 | raise layerindexlib.LayerIndexFetchError("No branches specified for _load_bblayers!") |
77 | 78 | ||
78 | index = layerindexlib.LayerIndexObj() | 79 | index = layerindexlib.LayerIndexObj() |
79 | 80 | ||
@@ -202,7 +203,7 @@ class CookerPlugin(layerindexlib.plugin.IndexPlugin): | |||
202 | try: | 203 | try: |
203 | depDict = bb.utils.explode_dep_versions2(deps) | 204 | depDict = bb.utils.explode_dep_versions2(deps) |
204 | except bb.utils.VersionStringException as vse: | 205 | except bb.utils.VersionStringException as vse: |
205 | bb.fatal('Error parsing LAYERDEPENDS_%s: %s' % (c, str(vse))) | 206 | bb.fatal('Error parsing LAYERDEPENDS_%s: %s' % (collection, str(vse))) |
206 | 207 | ||
207 | for dep, oplist in list(depDict.items()): | 208 | for dep, oplist in list(depDict.items()): |
208 | # We need to search ourselves, so use the _ version... | 209 | # We need to search ourselves, so use the _ version... |
@@ -268,7 +269,7 @@ class CookerPlugin(layerindexlib.plugin.IndexPlugin): | |||
268 | 269 | ||
269 | layer = bb.utils.get_file_layer(realfn[0], self.config_data) | 270 | layer = bb.utils.get_file_layer(realfn[0], self.config_data) |
270 | 271 | ||
271 | depBranchId = collection_layerbranch[layer] | 272 | depBranchId = collection[layer] |
272 | 273 | ||
273 | recipeId += 1 | 274 | recipeId += 1 |
274 | recipe = layerindexlib.Recipe(index, None) | 275 | recipe = layerindexlib.Recipe(index, None) |