diff options
| -rwxr-xr-x | usr.sbin/mergemaster/mergemaster.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh index 6fdcd02..7fcd93c 100755 --- a/usr.sbin/mergemaster/mergemaster.sh +++ b/usr.sbin/mergemaster/mergemaster.sh @@ -398,9 +398,9 @@ fi CVS_ID_TAG=FreeBSD delete_temproot () { - rm -rf "${TEMPROOT}" - chflags -R 0 "${TEMPROOT}" - rm -rf "${TEMPROOT}" + rm -rf "${TEMPROOT}" 2>/dev/null + chflags -R 0 "${TEMPROOT}" 2>/dev/null + rm -rf "${TEMPROOT}" || exit 1 } case "${RERUN}" in |
