From ccdaff9ef1a1b58ed8ebca378804ebe71137766c Mon Sep 17 00:00:00 2001
From: dougb <dougb@FreeBSD.org>
Date: Sun, 30 Jun 2002 18:47:57 +0000
Subject: * Handle all flags, not just schg * Make chflags -R more efficient by
 deleting everything we can first

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

(limited to 'usr.sbin')

diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh
index ee4678f..ecf134c 100755
--- a/usr.sbin/mergemaster/mergemaster.sh
+++ b/usr.sbin/mergemaster/mergemaster.sh
@@ -397,6 +397,12 @@ fi
 #
 CVS_ID_TAG=FreeBSD
 
+delete_temproot () {
+  rm -rf "${TEMPROOT}"
+  chflags -R 0 "${TEMPROOT}"
+  rm -rf "${TEMPROOT}"
+}
+
 case "${RERUN}" in
 '')
   # Set up the loop to test for the existence of the
@@ -425,8 +431,7 @@ case "${RERUN}" in
           echo ''
           echo "   *** Deleting the old ${TEMPROOT}"
           echo ''
-          chflags -R noschg "${TEMPROOT}"
-          rm -rf "${TEMPROOT}"
+          delete_temproot || exit 1
           unset TEST_TEMP_ROOT
           ;;
         [tT])
@@ -848,7 +853,7 @@ case "${AUTO_RUN}" in
 
   case "${DEL_TEMPROOT}" in
   [yY]*)
-    if chflags -R noschg "${TEMPROOT}" && rm -rf "${TEMPROOT}"; then
+    if delete_temproot; then
       echo " *** ${TEMPROOT} has been deleted"
     else
       echo " *** Unable to delete ${TEMPROOT}"
-- 
cgit v1.1