diff options
Diffstat (limited to 'bitbake/lib/bb/ui')
-rw-r--r-- | bitbake/lib/bb/ui/buildinfohelper.py | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/bitbake/lib/bb/ui/buildinfohelper.py b/bitbake/lib/bb/ui/buildinfohelper.py index 3ddcb2ac6d..e96e93440e 100644 --- a/bitbake/lib/bb/ui/buildinfohelper.py +++ b/bitbake/lib/bb/ui/buildinfohelper.py | |||
@@ -42,7 +42,7 @@ from orm.models import Variable, VariableHistory | |||
42 | from orm.models import Package, Package_File, Target_Installed_Package, Target_File | 42 | from orm.models import Package, Package_File, Target_Installed_Package, Target_File |
43 | from orm.models import Task_Dependency, Package_Dependency | 43 | from orm.models import Task_Dependency, Package_Dependency |
44 | from orm.models import Recipe_Dependency, Provides | 44 | from orm.models import Recipe_Dependency, Provides |
45 | from orm.models import Project, CustomImagePackage, CustomImageRecipe | 45 | from orm.models import Project, CustomImagePackage |
46 | from orm.models import signal_runbuilds | 46 | from orm.models import signal_runbuilds |
47 | 47 | ||
48 | from bldcontrol.models import BuildEnvironment, BuildRequest | 48 | from bldcontrol.models import BuildEnvironment, BuildRequest |
@@ -361,11 +361,6 @@ class ORMWrapper(object): | |||
361 | 361 | ||
362 | def get_update_layer_version_object(self, build_obj, layer_obj, layer_version_information): | 362 | def get_update_layer_version_object(self, build_obj, layer_obj, layer_version_information): |
363 | if isinstance(layer_obj, Layer_Version): | 363 | if isinstance(layer_obj, Layer_Version): |
364 | # Special case the toaster-custom-images layer which is created | ||
365 | # on the fly so don't update the values which may cause the layer | ||
366 | # to be duplicated on a future get_or_create | ||
367 | if layer_obj.layer.name == CustomImageRecipe.LAYER_NAME: | ||
368 | return layer_obj | ||
369 | # We already found our layer version for this build so just | 364 | # We already found our layer version for this build so just |
370 | # update it with the new build information | 365 | # update it with the new build information |
371 | logger.debug("We found our layer from toaster") | 366 | logger.debug("We found our layer from toaster") |