summaryrefslogtreecommitdiffstats
path: root/meta/lib/oe/package_manager.py
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-20 11:53:11 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-02 08:24:00 +0100
commit44e9a0d2fa759dea281fc32b602cd7878000c277 (patch)
tree69f6944e4bf34e2309ae8b3cc11eac13afcdf675 /meta/lib/oe/package_manager.py
parent8587bce564f715e46e7317218b5c190813d3a939 (diff)
downloadpoky-44e9a0d2fa759dea281fc32b602cd7878000c277.tar.gz
classes/lib: Update to explictly create lists where needed
Iterators now return views, not lists in python3. Where we need lists, handle this explicitly. (From OE-Core rev: caebd862bac7eed725e0f0321bf50793671b5312) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe/package_manager.py')
-rw-r--r--meta/lib/oe/package_manager.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index abe9f6878b..54e6970298 100644
--- a/meta/lib/oe/package_manager.py
+++ b/meta/lib/oe/package_manager.py
@@ -643,8 +643,8 @@ class PackageManager(object):
643 def construct_uris(self, uris, base_paths): 643 def construct_uris(self, uris, base_paths):
644 def _append(arr1, arr2, sep='/'): 644 def _append(arr1, arr2, sep='/'):
645 res = [] 645 res = []
646 narr1 = map(lambda a: string.rstrip(a, sep), arr1) 646 narr1 = [string.rstrip(a, sep) for a in arr1]
647 narr2 = map(lambda a: string.lstrip(string.rstrip(a, sep), sep), arr2) 647 narr2 = [string.lstrip(string.rstrip(a, sep), sep) for a in arr2]
648 for a1 in narr1: 648 for a1 in narr1:
649 if arr2: 649 if arr2:
650 for a2 in narr2: 650 for a2 in narr2:
@@ -1111,7 +1111,7 @@ class RpmPM(PackageManager):
1111 sub_rdep = sub_data.get("RDEPENDS_" + pkg) 1111 sub_rdep = sub_data.get("RDEPENDS_" + pkg)
1112 if not sub_rdep: 1112 if not sub_rdep:
1113 continue 1113 continue
1114 done = bb.utils.explode_dep_versions2(sub_rdep).keys() 1114 done = list(bb.utils.explode_dep_versions2(sub_rdep).keys())
1115 next = done 1115 next = done
1116 # Find all the rdepends on dependency chain 1116 # Find all the rdepends on dependency chain
1117 while next: 1117 while next: