mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-19 18:49:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

bitbake: toaster: do not stop data import on bad data

Browse Source 
The layer data update in Layer source needlessly stops
processing by throwing an Exception when bad layer data cannot
be inserted in the database (e.g. invalid dependencies).

This patch changes the behaviour to ignore bad data, and
continue with data import after detailed logging through the
logging system.

[YOCTO #7955]

(Bitbake rev: e0911e408db4fa07086738fe11121b173b4d1cf5)

Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>
Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexandru DAMIAN
2015-08-18 17:28:54 +01:00
committed by Richard Purdie
parent be4636aef2
commit c159b3c117
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bitbake/lib/toaster/orm/models.py
View File

@@ -19,7 +19,7 @@
# with this program; if not, write to the Free Software Foundation, Inc., # with this program; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
from django.db import models from django.db import models, IntegrityError
from django.db.models import F, Q, Avg, Max from django.db.models import F, Q, Avg, Max
from django.utils import timezone from django.utils import timezone
@@ -938,7 +938,7 @@ class LayerIndexLayerSource(LayerSource):
try: try:
dependlist[lv].append(Layer_Version.objects.get(layer_source = self, layer__up_id = ldi['dependency'], up_branch = lv.up_branch)) dependlist[lv].append(Layer_Version.objects.get(layer_source = self, layer__up_id = ldi['dependency'], up_branch = lv.up_branch))
except Layer_Version.DoesNotExist: except Layer_Version.DoesNotExist:
logger.warning("Cannot find layer version %s dep:%s up_brach:%s" % (self, ldi['dependency'], lv.up_branch)) logger.warning("Cannot find layer version (ls:%s), up_id:%s lv:%s" % (self, ldi['dependency'], lv))
for lv in dependlist: for lv in dependlist:
LayerVersionDependency.objects.filter(layer_version = lv).delete() LayerVersionDependency.objects.filter(layer_version = lv).delete()
@@ -989,8 +989,8 @@ class LayerIndexLayerSource(LayerSource):
if 'inherits' in ri: if 'inherits' in ri:
ro.is_image = 'image' in ri['inherits'].split() ro.is_image = 'image' in ri['inherits'].split()
ro.save() ro.save()
except Exception: except IntegrityError as e:
logger.warning("Duplicate Recipe, ignoring: %s " % vars(ro)) logger.debug("Failed saving recipe, ignoring: %s (%s:%s)" % (e, ro.layer_version, ri['filepath']+"/"+ri['filename']))
if not connection.features.autocommits_when_autocommit_is_off: if not connection.features.autocommits_when_autocommit_is_off:
transaction.set_autocommit(True) transaction.set_autocommit(True)