[oe-commits] [bitbake] 03/20: lib/bb/utils.py: return sorted OrderedDict in explode_dep_versions2

[git at git.openembedded.org]

rpurdie pushed a commit to branch master
in repository bitbake.

commit a392f19f16ef8202ce3c12afbeb186a02438da17
Author: Robert Yang <liezhi.yang at windriver.com>
AuthorDate: Sun Jul 17 20:42:51 2016 -0700

    lib/bb/utils.py: return sorted OrderedDict in explode_dep_versions2
    
    The OrderedDict's item is sorted by insertion order, there might be a
    problem when build the same recipe again, for example:
    - First build of acl:
      Depends: libattr1 (>= 2.4.47), libc6 (>= 2.24)
    - Second build of acl:
      Depends: libc6 (>= 2.24), libattr1 (>= 2.4.47)
    
    They are exactly the same depends, but tools like "diff" doesn't think
    so. Return sorted OrderedDict will fix the problem.
    
    Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 lib/bb/utils.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/bb/utils.py b/lib/bb/utils.py
index 3bc2437..3f1c645 100644
--- a/lib/bb/utils.py
+++ b/lib/bb/utils.py
@@ -250,6 +250,7 @@ def explode_dep_versions2(s):
         if not (i in r and r[i]):
             r[lastdep] = []
 
+    r = collections.OrderedDict(sorted(r.items(), key=lambda x: x[0]))
     return r
 
 def explode_dep_versions(s):

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.