From 3dc68f1750e4fa1e11fa2110a8ac9579ab1e9aa0 Mon Sep 17 00:00:00 2001 From: Sasha Smundak Date: Tue, 21 Sep 2021 08:07:49 -0700 Subject: [PATCH] Return find_and_copy result in sorted order. To facilitate regression testing. Fixes: 200679083 Test: manual Change-Id: I9c5ee84a26cecd1c1d770b773539a77f8115fe48 --- 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 710957b06d..9fa4a8c14f 100644 --- a/core/product_config.rbc +++ b/core/product_config.rbc @@ -401,8 +401,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 ["%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'.