[oe-commits] [bitbake] 04/05: lib/bb/utils.py: Fix explode_dep_versions2() determinism issue
git at git.openembedded.org
git at git.openembedded.org
Mon May 9 13:27:23 UTC 2016
rpurdie pushed a commit to branch master-next
in repository bitbake.
commit 0c0ba9275a79a3aa59f11154d534b95dd9d6638e
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Mon May 9 14:07:17 2016 +0100
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 at linuxfoundation.org>
---
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 2abf518..0c553dd 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 = ""
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list