Re: [DistroKit] [PATCH 2/3] ci-prepare: make return value safe

[Roland Hieber <rhi@pengutronix.de>]

On Wed, Oct 22, 2025 at 02:29:11PM +0200, Roland Hieber wrote:
> If ./selected_toolchain_r5 does not exist, [ -e selected_toolchain_r5 ]
> will return falsely and the script will return falsely too, failing the
> build. Ignore the return values by wrapping the test calls into ifs
> instead of relying on short-circuit.
> 
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> ---
>  ci-prepare | 12 ++++++++----
>  1 file changed, 8 insertions(+), 4 deletions(-)
> 
> diff --git a/ci-prepare b/ci-prepare
> index 0bb4e58664c2..14337f14e46e 100755
> --- a/ci-prepare
> +++ b/ci-prepare
> @@ -3,14 +3,18 @@
>  # version symlinked to ./p
>  case "${JOB_BASE_NAME}" in
>         *v8a*)
> -                [ -e selected_toolchain_r5 ] || {
> +                if [ -e selected_toolchain_r5 ]; then

Wait no, this is missing a negation in the if. Currently this makes the build
fail.

 - Roland

>                          # store away the currently selected toolchain
> -                        [ -e selected_toolchain ] && mv selected_toolchain selected_toolchain_ci_backup
> +                        if [ -e selected_toolchain ]; then
> +                                mv selected_toolchain selected_toolchain_ci_backup
> +                        fi
>                          # create toolchain based on v7a platform, which is needed for R5 processor.
>                          ./p toolchain --platformconfig=configs/platform-v7a/platformconfig
>                          mv selected_toolchain selected_toolchain_r5
>                          # restore the selected toolchain, if there was one before
> -                        [ -e selected_toolchain_ci_backup ] && mv selected_toolchain_ci_backup selected_toolchain
> -                }
> +                        if [ -e selected_toolchain_ci_backup ]; then
> +                                mv selected_toolchain_ci_backup selected_toolchain
> +                        fi
> +                fi
>                 ;;
>  esac
> -- 
> 2.47.3
> 
> 
> 

-- 
Roland Hieber, Pengutronix e.K.          | rhi@pengutronix.de          |
Steuerwalder Str. 21                     | https://www.pengutronix.de/ |
31137 Hildesheim, Germany                | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686         | Fax:   +49-5121-206917-5555 |