bin/merge-app-bundles | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit fcf270908a0eafb2f5c30a3b8d8bd63541eac81f
Author: Jan Holesovsky <[email protected]>
AuthorDate: Tue Dec 9 11:06:02 2025 +0100
Commit: Andras Timar <[email protected]>
CommitDate: Tue Dec 9 11:38:08 2025 +0100
Don't fail when copying files from the 2nd location
The 2nd location may contain directory/ies that don't exist in the 1st
location; in that case the copying used to fail because the target
directory was not present in the final location.
Change-Id: Ie115128a45cd823723a91f7ea5985602a2448342
diff --git a/bin/merge-app-bundles b/bin/merge-app-bundles
index 34f84274ec5d..ffd7853fd16b 100755
--- a/bin/merge-app-bundles
+++ b/bin/merge-app-bundles
@@ -54,6 +54,8 @@ OUT=$(cd "$3" && /bin/pwd)
(
cd "$ONE"
find . -type d -print
+ cd "$TWO"
+ find . -type d -print
) |
(
cd "$OUT"
