summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorBrian Avery <brian.avery@intel.com>2015-07-20 17:23:20 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-21 15:36:14 +0100
commit0c0ec8611098e306cf428191e5205d81df032b7c (patch)
tree47ae73304799eb3615f5a038d88bf677f0335004 /bitbake
parent0f8d89ce66cfffccc9911d6c61470a585173b79d (diff)
downloadpoky-0c0ec8611098e306cf428191e5205d81df032b7c.tar.gz
bitbake: toaster: continue processing layer dependencies despite errors
Sometimes, a layer dependency will not exist, or not exist for a particualr branch. In this case we need to continue processing and hope for the best. [YOCTO #7955] (Bitbake rev: 2961bf2612fce111a7be6cef285595a075200780) Signed-off-by: Brian Avery <brian.avery@intel.com> Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/toaster/orm/models.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/bitbake/lib/toaster/orm/models.py b/bitbake/lib/toaster/orm/models.py
index 4ea75f2bf3..2b1a5b7905 100644
--- a/bitbake/lib/toaster/orm/models.py
+++ b/bitbake/lib/toaster/orm/models.py
@@ -889,9 +889,8 @@ class LayerIndexLayerSource(LayerSource):
889 dependlist[lv] = [] 889 dependlist[lv] = []
890 try: 890 try:
891 dependlist[lv].append(Layer_Version.objects.get(layer_source = self, layer__up_id = ldi['dependency'], up_branch = lv.up_branch)) 891 dependlist[lv].append(Layer_Version.objects.get(layer_source = self, layer__up_id = ldi['dependency'], up_branch = lv.up_branch))
892 except Layer_Version.DoesNotExist as e: 892 except Layer_Version.DoesNotExist:
893 print "Cannot find layer version ", self, ldi['dependency'], lv.up_branch 893 print "Cannot find layer version ", self, ldi['dependency'], lv.up_branch
894 raise e
895 894
896 for lv in dependlist: 895 for lv in dependlist:
897 LayerVersionDependency.objects.filter(layer_version = lv).delete() 896 LayerVersionDependency.objects.filter(layer_version = lv).delete()