From 57e765e38c6382a9b36d5ee2a6f3fa96ac905b82 Mon Sep 17 00:00:00 2001 From: Andre Rosa Date: Sat, 6 Apr 2019 01:29:37 +0000 Subject: utils: Make prune_suffix prune a suffix 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. Signed-off-by: Andre Rosa Signed-off-by: Richard Purdie --- lib/bb/utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bb/utils.py b/lib/bb/utils.py index b652a6838..d186b1fa2 100644 --- a/lib/bb/utils.py +++ b/lib/bb/utils.py @@ -722,8 +722,8 @@ 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): - return var.replace(suffix, "") + if suffix and var.endswith(suffix): + return var[:-len(suffix)] return var def mkdirhier(directory): -- cgit 1.2.3-korg