commit 057667a90f130cea2136aaec8bf52cc941617a29
author Treehugger Robot <treehugger-gerrit@google.com> Tue Mar 08 20:25:40 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 08 20:25:40 2022 +0000
tree 8a45b33e9e72a2867cfea30498c6ab8f7e52e2f3
parent 7d4b3d25e7f00ca6a26d944f2ffa6a0d13b8b10a
parent c6de8d531c0d6ff8bc9dedc7a90e231082b4779b

Merge "Remove duplicate slashes from find_and_copy results"

core/product_config.rbc

diff --git a/core/product_config.rbc b/core/product_config.rbc
index 469b0f7..8f27c99 100644
--- a/core/product_config.rbc
+++ b/core/product_config.rbc
@@ -479,8 +479,8 @@
 
 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)."""