Date: Tue, 11 Nov 2008 02:13:21 +0000 (UTC) From: Maxim Sobolev <sobomax@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r184832 - head/usr.sbin/mergemaster Message-ID: <200811110213.mAB2DMFw088312@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sobomax Date: Tue Nov 11 02:13:21 2008 New Revision: 184832 URL: http://svn.freebsd.org/changeset/base/184832 Log: No need to run rm ${COMPFILE} after mm_install() - mm_install() does it for us. Modified: head/usr.sbin/mergemaster/mergemaster.sh Modified: head/usr.sbin/mergemaster/mergemaster.sh ============================================================================== --- head/usr.sbin/mergemaster/mergemaster.sh Tue Nov 11 00:32:55 2008 (r184831) +++ head/usr.sbin/mergemaster/mergemaster.sh Tue Nov 11 02:13:21 2008 (r184832) @@ -960,7 +960,6 @@ for COMPFILE in `find . -type f -size +0 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200811110213.mAB2DMFw088312>