From 0dd6823875cac63a7119f63851a0dc01ea1f2e80 Mon Sep 17 00:00:00 2001 From: Andre Rosa Date: Sat, 6 Apr 2019 01:28:25 +0000 Subject: lib/oe/utils: Make prune_suffix prune a suffix ... instead of replacing a substring that could happen more than once and not only when it ends with it. Do the same for the prefix. See related https://github.com/openembedded/bitbake/pull/24 . There it stops replacing sufixes once first one is matched but not here. (From OE-Core rev: 610ac84170f8a91cc3321edfc336a9e39f24ebe3) Signed-off-by: Andre Rosa Signed-off-by: Richard Purdie --- meta/lib/oe/utils.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py index cedd053d36..a4fd79ccb2 100644 --- a/meta/lib/oe/utils.py +++ b/meta/lib/oe/utils.py @@ -78,12 +78,12 @@ def prune_suffix(var, suffixes, d): # See if var ends with any of the suffixes listed and # remove it if found for suffix in suffixes: - if var.endswith(suffix): - var = var.replace(suffix, "") + if suffix and var.endswith(suffix): + var = var[:-len(suffix)] prefix = d.getVar("MLPREFIX") if prefix and var.startswith(prefix): - var = var.replace(prefix, "") + var = var[len(prefix):] return var -- cgit v1.2.3-54-g00ecf