summaryrefslogtreecommitdiffstats
path: root/meta/classes-recipe
diff options
context:
space:
mode:
Diffstat (limited to 'meta/classes-recipe')
-rw-r--r--meta/classes-recipe/rootfs-postcommands.bbclass3
1 files changed, 1 insertions, 2 deletions
diff --git a/meta/classes-recipe/rootfs-postcommands.bbclass b/meta/classes-recipe/rootfs-postcommands.bbclass
index 163c7f41b1..3d05ff3b28 100644
--- a/meta/classes-recipe/rootfs-postcommands.bbclass
+++ b/meta/classes-recipe/rootfs-postcommands.bbclass
@@ -106,12 +106,11 @@ def compare_users(user, e_user):
106 # user and e_user must not have None values. Unset values must be '-'. 106 # user and e_user must not have None values. Unset values must be '-'.
107 (name, uid, gid, comment, homedir, ushell) = user 107 (name, uid, gid, comment, homedir, ushell) = user
108 (e_name, e_uid, e_gid, e_comment, e_homedir, e_ushell) = e_user 108 (e_name, e_uid, e_gid, e_comment, e_homedir, e_ushell) = e_user
109 # Ignore 'uid', 'gid' or 'comment' if they are not set 109 # Ignore 'uid', 'gid' or 'homedir' if they are not set
110 # Ignore 'shell' and 'ushell' if one is not set 110 # Ignore 'shell' and 'ushell' if one is not set
111 return name == e_name \ 111 return name == e_name \
112 and (uid == '-' or uid == e_uid) \ 112 and (uid == '-' or uid == e_uid) \
113 and (gid == '-' or gid == e_gid) \ 113 and (gid == '-' or gid == e_gid) \
114 and (comment == '-' or e_comment == '-' or comment.lower() == e_comment.lower()) \
115 and (homedir == '-' or e_homedir == '-' or homedir == e_homedir) \ 114 and (homedir == '-' or e_homedir == '-' or homedir == e_homedir) \
116 and (ushell == '-' or e_ushell == '-' or ushell == e_ushell) 115 and (ushell == '-' or e_ushell == '-' or ushell == e_ushell)
117 116