[oe-commits] Pascal Bach : image.py: Fix error in graph sorting

git at git.openembedded.org git at git.openembedded.org
Thu Oct 30 13:03:24 UTC 2014


Module: openembedded-core.git
Branch: master-next
Commit: cec9725c540c2d54c27092e40d159694cea75b5f
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=cec9725c540c2d54c27092e40d159694cea75b5f

Author: Pascal Bach <pascal.bach at siemens.com>
Date:   Fri Oct 24 09:41:10 2014 +0200

image.py: Fix error in graph sorting

The graph sorting algorithm for image dependencies does a look for an
occurrence of a searched string instead of comparing the chunk to the
searched string. This leads to the problem that ubifs is recognized as ubi aswell.

This fixes this by splitting up the string into chunks.

Signed-off-by: Pascal Bach <pascal.bach at siemens.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/lib/oe/image.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/lib/oe/image.py b/meta/lib/oe/image.py
index 354a676..7e080b0 100644
--- a/meta/lib/oe/image.py
+++ b/meta/lib/oe/image.py
@@ -109,7 +109,7 @@ class ImageDepGraph(object):
         # remove added nodes from deps_array
         for item in group:
             for node in self.graph:
-                if item in self.graph[node]:
+                if item in self.graph[node].split():
                     self.deps_array[node][0] -= 1
 
             self.deps_array.pop(item, None)



More information about the Openembedded-commits mailing list