From a9adb798e1daed8eaf33ae7a31f81ff74d4193ca Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Thu, 4 Jan 2024 17:15:44 +0200 Subject: utils: update-mojo.sh: Reject a dirty libcamera tree If the libcamera tree is dirty committing the result of the mojo update will be messy. Bail out in that case. Signed-off-by: Laurent Pinchart Reviewed-by: Milan Zamazal Reviewed-by: Kieran Bingham Signed-off-by: Kieran Bingham --- utils/update-mojo.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/utils/update-mojo.sh b/utils/update-mojo.sh index b6fbc6d1..25a280e0 100755 --- a/utils/update-mojo.sh +++ b/utils/update-mojo.sh @@ -15,6 +15,12 @@ chromium_dir="$(realpath "$1")" cd "${ipc_dir}/../../" +# Reject dirty libcamera trees +if [ -n "$(git status --porcelain -uno)" ] ; then + echo "libcamera tree is dirty" + exit 1 +fi + if [ ! -d "${chromium_dir}/mojo" ] ; then echo "Directory ${chromium_dir} doesn't contain mojo" exit 1 @@ -28,7 +34,7 @@ fi # Get the chromium commit id version=$(git -C "${chromium_dir}" rev-parse --short HEAD) -# Reject dirty trees +# Reject dirty chromium trees if [ -n "$(git -C "${chromium_dir}" status --porcelain)" ] ; then echo "Chromium tree in ${chromium_dir} is dirty" exit 1 -- cgit v1.2.1