From 335a351231a7346a14e3f8c8276238363578311c Mon Sep 17 00:00:00 2001 From: Maxim Sobolev Date: Tue, 11 Nov 2008 02:13:21 +0000 Subject: [PATCH] No need to run rm ${COMPFILE} after mm_install() - mm_install() does it for us. --- usr.sbin/mergemaster/mergemaster.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh index df1954d2d117..f8504ec9b397 100755 --- a/usr.sbin/mergemaster/mergemaster.sh +++ b/usr.sbin/mergemaster/mergemaster.sh @@ -960,7 +960,6 @@ for COMPFILE in `find . -type f -size +0`; do if mm_install "${COMPFILE}"; then echo " *** ${COMPFILE} upgraded successfully" echo '' - rm "${COMPFILE}" else echo " *** Problem upgrading ${COMPFILE}, it will remain to merge by hand" fi