diff options
author | Bryan Drewery <bryan@shatow.net> | 2014-04-17 02:19:23 +0400 |
---|---|---|
committer | Bryan Drewery <bryan@shatow.net> | 2014-04-17 02:19:23 +0400 |
commit | 01a23b071cc0dffcd9c5dda423a74257a64bcc44 (patch) | |
tree | 76d44fd639b0efbc5d167fd516825e1ee3a171aa /src/share | |
parent | 7f902ac2fa6aa476483b1550566953c2ff6eaac9 (diff) |
Leftovers: Don't show @dirrm for dirs already in plist
MFH
Diffstat (limited to 'src/share')
-rwxr-xr-x | src/share/poudriere/common.sh | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/share/poudriere/common.sh b/src/share/poudriere/common.sh index 3a6363e8..565c639a 100755 --- a/src/share/poudriere/common.sh +++ b/src/share/poudriere/common.sh @@ -1639,7 +1639,7 @@ Try testport with -n to use PREFIX=LOCALBASE" local mod=$(mktemp ${mnt}/tmp/mod.XXXXXX) local mod1=$(mktemp ${mnt}/tmp/mod1.XXXXXX) local die=0 - local users user homedirs + local users user homedirs tmpplist # Check stage-qa first if [ -z "${no_stage}" ]; then @@ -1656,6 +1656,7 @@ Try testport with -n to use PREFIX=LOCALBASE" msg "Checking for extra files and directories" bset ${MY_JOBID} status "leftovers:${port}" + tmpplist=$(injail make -C ${portdir} -VTMPPLIST) users=$(injail make -C ${portdir} -VUSERS) homedirs="" for user in ${users}; do @@ -1748,7 +1749,14 @@ Try testport with -n to use PREFIX=LOCALBASE" msg "Error: Files or directories left over:" die=1 grep -v "^@dirrm" ${add} - grep "^@dirrm" ${add} | sort -r + # Remove @dirrm for parent dirs already in plist + grep "^@dirrm" ${add} | sort -r | while read \ + type dir; do + grep -qE \ + "^@(unexec rmdir \"?(%D/)?${dir}[ \"]|dirrm(try)? ${dir}\$)" \ + ${mnt}${tmpplist} || + echo "${type} ${dir}" + done fi if [ -s "${del}" ]; then msg "Error: Files or directories removed:" |