summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2016-06-05 22:52:42 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-05 23:39:47 +0100
commit6c5d7f1fb276cbe0a461ece6c8f0ca17a478fa8c (patch)
treed78043d27b69dbd6452abf908c57f05bcdec482b /meta/lib
parent5481363ac7f000d624c264fb27b27d851d2be311 (diff)
downloadopenembedded-core-contrib-6c5d7f1fb276cbe0a461ece6c8f0ca17a478fa8c.tar.gz
openembedded-core-contrib-6c5d7f1fb276cbe0a461ece6c8f0ca17a478fa8c.tar.bz2
openembedded-core-contrib-6c5d7f1fb276cbe0a461ece6c8f0ca17a478fa8c.zip
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>
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oe/package_manager.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index 71e5b502e7..3b1d24fff2 100644
--- a/meta/lib/oe/package_manager.py
+++ b/meta/lib/oe/package_manager.py
@@ -638,8 +638,8 @@ class PackageManager(object, metaclass=ABCMeta):
def construct_uris(self, uris, base_paths):
def _append(arr1, arr2, sep='/'):
res = []
- narr1 = [string.rstrip(a, sep) for a in arr1]
- narr2 = [string.lstrip(string.rstrip(a, sep), sep) for a in arr2]
+ narr1 = [a.rstrip(sep) for a in arr1]
+ narr2 = [a.rstrip(sep).lstrip(sep) for a in arr2]
for a1 in narr1:
if arr2:
for a2 in narr2: