From 39d6a30a28f66c599e18beddbd847f40dcff623c Mon Sep 17 00:00:00 2001 From: Amanda Brindle Date: Mon, 5 Mar 2018 11:11:52 -0800 Subject: utils.py: Add option for explode_dep_versions2 to return unsorted Before, explode_dep_versions2 would sort the OrderedDict before returning. This function will still sort the OrderedDict by default, but will now have the option to return the OrderedDict unsorted. This option will allow us to check if the order of the package list has changed. Signed-off-by: Amanda Brindle Signed-off-by: Richard Purdie --- lib/bb/utils.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/bb/utils.py b/lib/bb/utils.py index c540b49cf..8b739d784 100644 --- a/lib/bb/utils.py +++ b/lib/bb/utils.py @@ -187,7 +187,7 @@ def explode_deps(s): #r[-1] += ' ' + ' '.join(j) return r -def explode_dep_versions2(s): +def explode_dep_versions2(s, *, sort=True): """ Take an RDEPENDS style string of format: "DEPEND1 (optional version) DEPEND2 (optional version) ..." @@ -250,7 +250,8 @@ 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])) + if sort: + r = collections.OrderedDict(sorted(r.items(), key=lambda x: x[0])) return r def explode_dep_versions(s): -- cgit 1.2.3-korg