X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mjo-overlay.git;a=blobdiff_plain;f=eclass%2Fsys-user.eclass;h=8a4c426e3e0dcc36801d63079d427e8891d34241;hp=6fb8f7ab17c96e289d5762ab109c0b5eb0c0c287;hb=8da30d4d982f17cb7605a3bb0804b5561acb6e31;hpb=d2e688a09593fb99ba9c189a18494039fb9417f6 diff --git a/eclass/sys-user.eclass b/eclass/sys-user.eclass index 6fb8f7a..8a4c426 100644 --- a/eclass/sys-user.eclass +++ b/eclass/sys-user.eclass @@ -83,7 +83,7 @@ sys-user_getuid() { # Output the real UID of the given user, or the empty string if the # user does not exist on the system. [[ $# -eq 1 ]] || die "usage: sys-user_getuid " - echo $(id --real --user "${1}") + echo $(id --real --user "${1}" 2>/dev/null) } sys-user_getname() { @@ -178,7 +178,8 @@ sys-user_src_configure() { fi local current_name=$(sys-user_getname "${SYS_USER_UID}") - if [[ "${current_name}" != "${SYS_USER_NAME}" ]]; then + if [[ -n "${current_name}" ]] && \ + [[ "${current_name}" != "${SYS_USER_NAME}" ]]; then # This UID is already taken by another user, but this # specific UID was not important (we checked in # pkg_pretend), so fall back to an arbitrary one.