[ptxdist] [PATCH] ptxd_make_nested: Fix parameter passing for --dirty, --force and --pedantic

[ptxdist] [PATCH] ptxd_make_nested: Fix parameter passing for --dirty, --force and --pedantic

[Uwe Kleine-König]

Some variables corresponding to ptxdist parameters use "true" as value
when given, others use "1". PTXDIST_DIRTY, PTXDIST_FORCE and
PTXDIST_PEDANTIC are in the first group according to

	git grep -E 'PTXDIST_(DIRTY|FORCE|FEDANTIC)='

. Adapt ptxd_make_nested_ptxdist() accordingly.

Fixes: 5169ae99daf8 ("add support for nested PTXdist execution")
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 scripts/lib/ptxd_make_nested.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/lib/ptxd_make_nested.sh b/scripts/lib/ptxd_make_nested.sh
index cae12bceb377..2c4af5337207 100644
--- a/scripts/lib/ptxd_make_nested.sh
+++ b/scripts/lib/ptxd_make_nested.sh
@@ -46,13 +46,13 @@ ptxd_make_nested_ptxdist() {
     fi
     args=( "cd" "${pkg_workspace}" "&&" "${PTXDIST_TOPDIR}/bin/ptxdist" )
 
-    if [ "${PTXDIST_DIRTY}" = 1 ]; then
+    if [ "${PTXDIST_DIRTY}" = true ]; then
 	args[${#args[*]}]="--dirty"
     fi
-    if [ "${PTXDIST_FORCE}" = 1 ]; then
+    if [ "${PTXDIST_FORCE}" = true ]; then
 	args[${#args[*]}]="--force"
     fi
-    if [ "${PTXDIST_PEDANTIC}" = 1 ]; then
+    if [ "${PTXDIST_PEDANTIC}" = true ]; then
 	args[${#args[*]}]="--pedantic"
     fi
     if [ "${PTXDIST_QUIET}" = 1 ]; then
-- 
2.42.0

Re: [ptxdist] [APPLIED] ptxd_make_nested: Fix parameter passing for --dirty, --force and --pedantic

[Michael Olbrich]

Thanks, applied as 98bc55e65d3b5c64ea15c86d2ac6627fdb13fbae.

Michael

[sent from post-receive hook]

On Fri, 24 Nov 2023 08:28:08 +0100, Uwe Kleine-König <u.kleine-koenig@pengutronix.de> wrote:
> Some variables corresponding to ptxdist parameters use "true" as value
> when given, others use "1". PTXDIST_DIRTY, PTXDIST_FORCE and
> PTXDIST_PEDANTIC are in the first group according to
> 
> 	git grep -E 'PTXDIST_(DIRTY|FORCE|FEDANTIC)='
> 
> . Adapt ptxd_make_nested_ptxdist() accordingly.
> 
> Fixes: 5169ae99daf8 ("add support for nested PTXdist execution")
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> Message-Id: <20231110093705.45879-2-u.kleine-koenig@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/scripts/lib/ptxd_make_nested.sh b/scripts/lib/ptxd_make_nested.sh
> index cae12bceb377..2c4af5337207 100644
> --- a/scripts/lib/ptxd_make_nested.sh
> +++ b/scripts/lib/ptxd_make_nested.sh
> @@ -46,13 +46,13 @@ ptxd_make_nested_ptxdist() {
>      fi
>      args=( "cd" "${pkg_workspace}" "&&" "${PTXDIST_TOPDIR}/bin/ptxdist" )
>  
> -    if [ "${PTXDIST_DIRTY}" = 1 ]; then
> +    if [ "${PTXDIST_DIRTY}" = true ]; then
>  	args[${#args[*]}]="--dirty"
>      fi
> -    if [ "${PTXDIST_FORCE}" = 1 ]; then
> +    if [ "${PTXDIST_FORCE}" = true ]; then
>  	args[${#args[*]}]="--force"
>      fi
> -    if [ "${PTXDIST_PEDANTIC}" = 1 ]; then
> +    if [ "${PTXDIST_PEDANTIC}" = true ]; then
>  	args[${#args[*]}]="--pedantic"
>      fi
>      if [ "${PTXDIST_QUIET}" = 1 ]; then