hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2024-12-19 22:43:22 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Suppress spurious warning messages about rm -rf TEMPROOT failing

Browse Source 
before chflags, and exit non-zero if the old TEMPROOT dir
can't be deleted for whatever reason.
This commit is contained in:
Doug Barton 2002-08-05 08:47:52 +00:00
parent 008a2c53ce
commit 0aed4a4c3f
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=101362
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
usr.sbin/mergemaster/mergemaster.sh
View File

@ -398,9 +398,9 @@ fi
CVS_ID_TAG=FreeBSD CVS_ID_TAG=FreeBSD
delete_temproot () { delete_temproot () {
rm -rf "${TEMPROOT}" rm -rf "${TEMPROOT}" 2>/dev/null
chflags -R 0 "${TEMPROOT}" chflags -R 0 "${TEMPROOT}" 2>/dev/null
rm -rf "${TEMPROOT}" rm -rf "${TEMPROOT}" || exit 1
} }
case "${RERUN}" in case "${RERUN}" in