mirror of
https://git.yoctoproject.org/poky
synced 2026-05-30 12:29:55 +00:00
lib/oe/package_manager: adapt for Python 3
string.rstrip() doesn't exist in Python 3, so use the .rstrip method on the object itself instead. (From OE-Core rev: 554719e3f65e468f89a96d4869766d3ff7a8012e) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
5481363ac7
commit
6c5d7f1fb2
@@ -638,8 +638,8 @@ class PackageManager(object, metaclass=ABCMeta):
|
|||||||
def construct_uris(self, uris, base_paths):
|
def construct_uris(self, uris, base_paths):
|
||||||
def _append(arr1, arr2, sep='/'):
|
def _append(arr1, arr2, sep='/'):
|
||||||
res = []
|
res = []
|
||||||
narr1 = [string.rstrip(a, sep) for a in arr1]
|
narr1 = [a.rstrip(sep) for a in arr1]
|
||||||
narr2 = [string.lstrip(string.rstrip(a, sep), sep) for a in arr2]
|
narr2 = [a.rstrip(sep).lstrip(sep) for a in arr2]
|
||||||
for a1 in narr1:
|
for a1 in narr1:
|
||||||
if arr2:
|
if arr2:
|
||||||
for a2 in narr2:
|
for a2 in narr2:
|
||||||
|
|||||||
Reference in New Issue
Block a user