[oe-commits] [openembedded-core] 07/60: lib/oe/utils: Make prune_suffix prune a suffix

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 3a820c492f674fd464423dbc1ba18e80472e2e4b
Author: Andre Rosa <andre.rosa at lge.com>
AuthorDate: Sat Apr 6 01:28:25 2019 +0000

    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.
    
    Signed-off-by: Andre Rosa <andre.rosa at lge.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 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 cedd053..a4fd79c 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
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.