]> code.ossystems Code Review - openembedded-core.git/commitdiff
image.py: Fix error in graph sorting
authorPascal Bach <pascal.bach@siemens.com>
Fri, 24 Oct 2014 07:41:10 +0000 (09:41 +0200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 30 Oct 2014 13:00:32 +0000 (13:00 +0000)
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@siemens.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/lib/oe/image.py

index 354a676f42d8a9f0fa363291b8623a58ec68f7c8..7e080b00dd2178534e06c5e0ca479b75dc9ef26b 100644 (file)
@@ -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)