From: Michael Schroeder <mls@suse.de>
Date: Wed, 10 Nov 2010 14:19:45 +0000 (+0100)
Subject: allow x in abuild password field
X-Git-Tag: upstream/20120927~254
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6c2474df19ee242b7d58b1bed254647cb71cfd22;p=platform%2Fupstream%2Fbuild.git

allow x in abuild password field
---

diff --git a/build b/build
index 700afed..ed808fe 100755
--- a/build
+++ b/build
@@ -1606,7 +1606,7 @@ for SPECFILE in "${SPECFILES[@]}" ; do
 	    mkdir -p $BUILD_ROOT/home/abuild
 	    chown "$ABUILD_UID:$ABUILD_GID" $BUILD_ROOT/home/abuild
 	else
-	    if ! egrep "^abuild::${ABUILD_UID}:${ABUILD_GID}" >/dev/null <$BUILD_ROOT/etc/passwd ; then
+	    if ! egrep "^abuild:x?:${ABUILD_UID}:${ABUILD_GID}" >/dev/null <$BUILD_ROOT/etc/passwd ; then
 		echo "abuild user present in the buildroot ($BUILD_ROOT) but uid:gid does not match"
 		echo "buildroot currently using:"
 		egrep "^abuild:" <$BUILD_ROOT/etc/passwd