From 0737e003ca549d08a7dfe13452ae982f2e11fecd Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 9 May 2016 14:07:17 +0100 Subject: 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 --- lib/bb/utils.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 = "" -- cgit 1.2.3-korg