[oe-commits] [openembedded-core] 13/65: useradd-staticids.bbclass: Always fail/warn for missing IDs

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 8e4b4e28a7c3a9dbd6b9298bea5d2c1328b3f24a
Author: Peter Kjellerstedt <peter.kjellerstedt at axis.com>
AuthorDate: Wed Mar 15 01:27:14 2017 +0100

    useradd-staticids.bbclass: Always fail/warn for missing IDs
    
    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.
    
    Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt at axis.com>
    Signed-off-by: Ross Burton <ross.burton at intel.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 9b194df..c156a12 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
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.