svn commit: r373716 - head/Mk/Scripts

Antoine Brodin antoine at FreeBSD.org
Mon Dec 1 17:57:20 UTC 2014


Author: antoine
Date: Mon Dec  1 17:57:19 2014
New Revision: 373716
URL: https://svnweb.freebsd.org/changeset/ports/373716
QAT: https://qat.redports.org/buildarchive/r373716/

Log:
  Fix a false positive home directory leftover for ports with multiple USERS
  or with USERS matching another user in UIDs
  
  Reported by:	adamw (mail/spamassassin)
  With hat:	portmgr

Modified:
  head/Mk/Scripts/check_leftovers.sh

Modified: head/Mk/Scripts/check_leftovers.sh
==============================================================================
--- head/Mk/Scripts/check_leftovers.sh	Mon Dec  1 17:28:09 2014	(r373715)
+++ head/Mk/Scripts/check_leftovers.sh	Mon Dec  1 17:57:19 2014	(r373716)
@@ -40,7 +40,7 @@ if [ -n "${LOCALBASE}" ]; then
 else
 	LOCALBASE=$(make -C ${portdir} -VLOCALBASE)
 fi
-homedirs=$(awk -F: -v users=$(make -C ${portdir} -V USERS|sed -e 's, ,|,g;/^$/d') 'users && $1 ~ users {print $9}' ${PORTSDIR}/UIDs|sort -u|sed -e "s|/usr/local|${PREFIX}|")
+homedirs=$(awk -F: -v users=$(make -C ${portdir} -V USERS|sed -e 's, ,|,g;/^$/d;s,^,^(,;s,$,)$,') 'users && $1 ~ users {print $9}' ${PORTSDIR}/UIDs|sort -u|sed -e "s|/usr/local|${PREFIX}|"|tr "\n" " ")
 plistsub_sed=$(make -C ${portdir} -VPLIST_SUB_SED | /bin/sh ${PORTSDIR}/Mk/Scripts/plist_sub_sed_sort.sh)
 tmpplist=$(make -C ${portdir} -VTMPPLIST)
 


More information about the svn-ports-head mailing list