aboutsummaryrefslogtreecommitdiffstats
path: root/lib/bb/utils.py
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-09 14:07:17 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-09 17:32:13 +0100
commit0737e003ca549d08a7dfe13452ae982f2e11fecd (patch)
tree698396b93099840f196dbc959026ea5c96e80aa6 /lib/bb/utils.py
parent58304fcce9727fd89564436771356c033ecd22a3 (diff)
downloadbitbake-0737e003ca549d08a7dfe13452ae982f2e11fecd.tar.gz
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(). Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib/bb/utils.py')
-rw-r--r--lib/bb/utils.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/bb/utils.py b/lib/bb/utils.py
index 2abf518ec..0c553dd76 100644
--- a/lib/bb/utils.py
+++ b/lib/bb/utils.py
@@ -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 = ""