Date: Sun, 4 May 2014 03:09:59 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r352937 - head/Mk/Scripts Message-ID: <201405040309.s4439x4g030194@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Sun May 4 03:09:58 2014 New Revision: 352937 URL: http://svnweb.freebsd.org/changeset/ports/352937 QAT: https://qat.redports.org/buildarchive/r352937/ Log: - Ignore MTREE owned PREFIX and PREFIX/info removal for now. The removal of PREFIX/info may be a bug in bsd.port.mk and needs more testing. With hat: portmgr Reported by: gerald Modified: head/Mk/Scripts/check-stagedir.sh Modified: head/Mk/Scripts/check-stagedir.sh ============================================================================== --- head/Mk/Scripts/check-stagedir.sh Sun May 4 03:08:38 2014 (r352936) +++ head/Mk/Scripts/check-stagedir.sh Sun May 4 03:09:58 2014 (r352937) @@ -320,8 +320,18 @@ check_invalid_directories_mtree() { | sort_dfs | sed "${sed_dirs}" \ >>${WRKDIR}/.invalid-plist-mtree || : if [ -s "${WRKDIR}/.invalid-plist-mtree" ]; then - ret=1 while read line; do + # Skip removal of PREFIX and PREFIX/info from + # bsd.port.mk for now. The removal of info may + # be a bug; it's part of BSD.local.dist. + # See ports/74691 + if [ "${PREFIX}" != "${LOCALBASE}" ]; then + case "${line}" in + "@dirrmtry info") continue ;; + "@unexec rmdir \"${PREFIX}\" >/dev/null 2>&1 || :") continue ;; + esac + fi + ret=1 echo "Error: Owned by MTREE: ${line}" >&2 done < ${WRKDIR}/.invalid-plist-mtree fi
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405040309.s4439x4g030194>