commit 128bfc440e4b6ebf9b29d292a6db69aa7f5b50c5
author Treehugger Robot <treehugger-gerrit@google.com> Sat Sep 25 02:27:35 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Sep 25 02:27:35 2021 +0000
tree 798f47e52e36875d023be4d7fc1a2c28a5c090f9
parent 684e74ae15046eaa3047bc76abf5c2c52c641c4b
parent 3dc68f1750e4fa1e11fa2110a8ac9579ab1e9aa0

Merge "Return find_and_copy result in sorted order."

core/product_config.rbc

diff --git a/core/product_config.rbc b/core/product_config.rbc
index 710957b..9fa4a8c 100644
--- a/core/product_config.rbc
+++ b/core/product_config.rbc
@@ -401,8 +401,8 @@
 
 def _find_and_copy(pattern, from_dir, to_dir):
     """Return a copy list for the files matching the pattern."""
-    return ["%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) for f in rblf_find_files(from_dir, pattern, only_files=1)])
 
 def _filter_out(pattern, text):
     """Return all the words from `text' that do not match any word in `pattern'.