bitbake: lib/bb/utils.py: Fix explode_dep_versions2() determinism issue

When we pass data into explode_dep_versions2(), we need to result to be
able to be processed in a deterministic way so that we end up with
consistent hash values. This means we need an ordered structure rather
than an unordered one.

To do this, return an OrderedDict() rather than a dict().

(Bitbake rev: 0737e003ca549d08a7dfe13452ae982f2e11fecd)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2016-05-09 14:07:17 +01:00
parent 3795f4d6a6
commit 442acd2ea9
1 changed files with 2 additions and 1 deletions

View File

@ -36,6 +36,7 @@ import traceback
import errno
import signal
import ast
import collections
from commands import getstatusoutput
from contextlib import contextmanager
from ctypes import cdll
@ -192,7 +193,7 @@ def explode_dep_versions2(s):
"DEPEND1 (optional version) DEPEND2 (optional version) ..."
and return a dictionary of dependencies and versions.
"""
r = {}
r = collections.OrderedDict()
l = s.replace(",", "").split()
lastdep = None
lastcmp = ""