From c6de8d531c0d6ff8bc9dedc7a90e231082b4779b Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Mon, 7 Mar 2022 11:14:56 -0800 Subject: [PATCH] Remove duplicate slashes from find_and_copy results The make version, find-copy-subdir-files, has very similiar functionality: it adds `| sed "s://:/:g"` to its results. Fixes: 223221122 Test: Manually Change-Id: Iaac96f760d46304aed27a7d31bb4e8bd930c2c55 --- core/product_config.rbc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/product_config.rbc b/core/product_config.rbc index 469b0f75ee..8f27c998d7 100644 --- a/core/product_config.rbc +++ b/core/product_config.rbc @@ -479,8 +479,8 @@ def _file_wildcard_exists(file_pattern): def _find_and_copy(pattern, from_dir, to_dir): """Return a copy list for the files matching the pattern.""" - return sorted(["%s/%s:%s/%s" % ( - from_dir, f, to_dir, f) for f in rblf_find_files(from_dir, pattern, only_files=1)]) + return sorted([("%s/%s:%s/%s" % (from_dir, f, to_dir, f)) + .replace("//", "/") for f in rblf_find_files(from_dir, pattern, only_files=1)]) def _findstring(needle, haystack): """Equivalent to GNU make's $(findstring)."""