[PATCH] image.py: Fix error in graph sorting

[PATCH] image.py: Fix error in graph sorting

[Pascal Bach]

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>
---
 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 c9b9033..5e07187 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)
-- 
1.7.10.4

Re: [PATCH] image.py: Fix error in graph sorting

[Laurentiu Palcu]

On Fri, Oct 24, 2014 at 09:41:10AM +0200, Pascal Bach wrote:
> 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>
Reviewed-by: Laurentiu Palcu <laurentiu.palcu@intel.com>

> ---
>  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 c9b9033..5e07187 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)
> -- 
> 1.7.10.4
> 
> -- 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core