From 0aed4a4c3f579a8dd068d5e2bee734240091a078 Mon Sep 17 00:00:00 2001
From: Doug Barton <dougb@FreeBSD.org>
Date: Mon, 5 Aug 2002 08:47:52 +0000
Subject: [PATCH] Suppress spurious warning messages about rm -rf TEMPROOT
 failing before chflags, and exit non-zero if the old TEMPROOT dir can't be
 deleted for whatever reason.

---
 usr.sbin/mergemaster/mergemaster.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh
index 6fdcd029b2aa..7fcd93c23ffa 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