aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmanda Brindle <amanda.r.brindle@intel.com>2018-03-05 11:11:52 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-15 03:39:18 -0700
commit39d6a30a28f66c599e18beddbd847f40dcff623c (patch)
treef366bcc612bee7ad8cdad5f5398aa62c8bac41c5
parent6138897de5ac6becf3bff56ce7a78f3ec208fcdf (diff)
downloadbitbake-contrib-39d6a30a28f66c599e18beddbd847f40dcff623c.tar.gz
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 <amanda.r.brindle@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--lib/bb/utils.py5
1 files 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):