Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 057667a9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Remove duplicate slashes from find_and_copy results"

parents 7d4b3d25 c6de8d53

core/product_config.rbc

+2 −2
Original line number Diff line number Diff line
@@ -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)."""