diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2014-05-04 03:09:58 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2014-05-04 03:09:58 +0000 |
| commit | 009875f080f08a2dfe6315ccc5e1891db7dbe9ec (patch) | |
| tree | 01855fd58750ddfd905676648faafa99e3eaf476 | |
| parent | - Always ignore /root/.ccache. Missed with r352918 (diff) | |
- 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
Notes
Notes:
svn path=/head/; revision=352937
| -rw-r--r-- | Mk/Scripts/check-stagedir.sh | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/Mk/Scripts/check-stagedir.sh b/Mk/Scripts/check-stagedir.sh index 04ff8d2463a1..0330dec83387 100644 --- a/Mk/Scripts/check-stagedir.sh +++ b/Mk/Scripts/check-stagedir.sh @@ -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 |