[PATCH 1/1] fix(isar-sstate): continue on missing varvals value

[PATCH 1/1] fix(isar-sstate): continue on missing varvals value

['Felix Moessbauer' via isar-users]

Before operating on the varvals values, we need to check if varvals !=
None.

Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
---
This fixes a regression found while applying the "fix expansion of
variables in SRC_URI of dpkg-prebuilt" patch.

Best regards,
Felix

 scripts/isar-sstate | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/isar-sstate b/scripts/isar-sstate
index 4ea38bc8..64511c44 100755
--- a/scripts/isar-sstate
+++ b/scripts/isar-sstate
@@ -869,9 +869,9 @@ def sstate_lint(target, verbose, sources_dir, build_dir, exit_code, pedantic, li
                name in ADDITIONAL_IGNORED_VARNAMES:
                 continue
             # remove leading whitespaces possibly added by appending
-            val = val.lstrip()
-            if not val:
+            if not val or not val.lstrip():
                 continue
+            val = val.lstrip()
 
             if name == 'SRC_URI':
                 src_uri = val.split()
-- 
2.39.2

-- 
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/isar-users/20240722120351.656333-1-felix.moessbauer%40siemens.com.

Re: [PATCH 1/1] fix(isar-sstate): continue on missing varvals value

[Uladzimir Bely]

On Mon, 2024-07-22 at 14:03 +0200, Felix Moessbauer wrote:
> Before operating on the varvals values, we need to check if varvals
> !=
> None.
> 
> Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
> ---
> This fixes a regression found while applying the "fix expansion of
> variables in SRC_URI of dpkg-prebuilt" patch.
> 
> Best regards,
> Felix
> 
>  scripts/isar-sstate | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/scripts/isar-sstate b/scripts/isar-sstate
> index 4ea38bc8..64511c44 100755
> --- a/scripts/isar-sstate
> +++ b/scripts/isar-sstate
> @@ -869,9 +869,9 @@ def sstate_lint(target, verbose, sources_dir,
> build_dir, exit_code, pedantic, li
>                 name in ADDITIONAL_IGNORED_VARNAMES:
>                  continue
>              # remove leading whitespaces possibly added by appending
> -            val = val.lstrip()
> -            if not val:
> +            if not val or not val.lstrip():
>                  continue
> +            val = val.lstrip()
>  
>              if name == 'SRC_URI':
>                  src_uri = val.split()

Applied to next, thanks.

-- 
Best regards,
Uladzimir.



-- 
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/isar-users/177fd82f52e48c392b959273103dd2522f048dcc.camel%40ilbers.de.