[OE-core] [PATCH] Make prune_suffix prune a suffix
andre.rosa
andre.rosa at lge.com
Sat Apr 6 01:28:25 UTC 2019
From: Andre Rosa <andre.rosa at lge.com>
... 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.
Signed-off-by: Andre Rosa <andre.rosa at lge.com>
---
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
--
2.20.1.519.g8feddda32c
More information about the Openembedded-core
mailing list