[OE-core] [PATCHv2 2/2] useradd-staticids.bbclass: Always fail/warn for missing IDs

[Mark Hatle]

On 3/14/17 10:56 AM, Peter Kjellerstedt wrote:
> Previously, with USERADD_ERROR_DYNAMIC set to error/warn, if a static
> UID/GID was specified in the recipe, then no error/warning would be
> issued even if no ID was specified in the passwd/groups files.

I'm glad it was this simple to implement.

Acked.

--Mark

> Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt at axis.com>
> ---
>  meta/classes/useradd-staticids.bbclass | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/meta/classes/useradd-staticids.bbclass b/meta/classes/useradd-staticids.bbclass
> index 9b194df490..c156a12ee5 100644
> --- a/meta/classes/useradd-staticids.bbclass
> +++ b/meta/classes/useradd-staticids.bbclass
> @@ -123,8 +123,7 @@ def update_useradd_static_config(d):
>                  users = merge_files(get_passwd_list(d), 7)
>  
>              if uaargs.LOGIN not in users:
> -                if not uaargs.uid or not uaargs.uid.isdigit() or not uaargs.gid:
> -                    handle_missing_id(uaargs.LOGIN, 'user', pkg)
> +                handle_missing_id(uaargs.LOGIN, 'user', pkg)
>                  newparams.append(param)
>                  continue
>  
> @@ -259,8 +258,7 @@ def update_useradd_static_config(d):
>                  groups = merge_files(get_group_list(d), 4)
>  
>              if gaargs.GROUP not in groups:
> -                if not gaargs.gid or not gaargs.gid.isdigit():
> -                    handle_missing_id(gaargs.GROUP, 'group', pkg)
> +                handle_missing_id(gaargs.GROUP, 'group', pkg)
>                  newparams.append(param)
>                  continue
>  
>