svn commit: r336794 - branches/2014Q1/Mk

[Baptiste Daroussin]

Author: bapt
Date: Wed Dec 18 00:06:36 2013
New Revision: 336794
URL: http://svnweb.freebsd.org/changeset/ports/336794

Log:
  MFH: r336793
  
  Fix user belonging to multiple groups when a package is staged
  
  Reported by:	flo

Modified:
  branches/2014Q1/Mk/bsd.port.mk
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/Mk/bsd.port.mk
==============================================================================
--- branches/2014Q1/Mk/bsd.port.mk	Wed Dec 18 00:03:53 2013	(r336793)
+++ branches/2014Q1/Mk/bsd.port.mk	Wed Dec 18 00:06:36 2013	(r336794)
@@ -4277,10 +4277,12 @@ create-users-groups:
 		IFS=","; for _login in $$members; do \
 			for _user in ${USERS}; do \
 				if [ "x$${_user}" = "x$${_login}" ]; then \
+					if [ "${NO_STAGE}" = "yes" ]; then \
 					if ! ${PW} groupshow ${_group} | ${GREP} -qw $${_login}; then \
 						${ECHO_MSG} "Adding user \`$${_login}' to group \`${_group}'."; \
 						${PW} groupmod ${_group} -m $${_login}; \
 					fi; \
+					fi; \
 					if [ -z "${WITH_PKGNG}" ]; then \
 							${ECHO_CMD} "@exec if ! ${PW} groupshow ${_group} | ${GREP} -qw $${_login}; then \
 								echo \"Adding user '$${_login}' to group '${_group}'.\"; \