diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2016-07-17 20:42:51 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-07-19 08:53:31 +0100 |
commit | a392f19f16ef8202ce3c12afbeb186a02438da17 (patch) | |
tree | 734bec1be10cb322efca0130ecc38fc297075e24 /lib/bb/utils.py | |
parent | 59cb919e5cd5c653fb4d69b2d6a4320648443e10 (diff) | |
download | bitbake-contrib-a392f19f16ef8202ce3c12afbeb186a02438da17.tar.gz |
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@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib/bb/utils.py')
-rw-r--r-- | lib/bb/utils.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/bb/utils.py b/lib/bb/utils.py index 3bc243723..3f1c645de 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): |