diff options
| author | Maxim Sobolev <sobomax@FreeBSD.org> | 2008-11-11 02:13:21 +0000 |
|---|---|---|
| committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2008-11-11 02:13:21 +0000 |
| commit | 335a351231a7346a14e3f8c8276238363578311c (patch) | |
| tree | 55eea1c18c0679f01b010be7f79a596030d12b30 /usr.sbin/mergemaster/mergemaster.sh | |
| parent | a06717238c5588856d15a81bbcca919bddc0df0c (diff) | |
| download | src-335a351231a7346a14e3f8c8276238363578311c.tar.gz src-335a351231a7346a14e3f8c8276238363578311c.zip | |
No need to run rm ${COMPFILE} after mm_install() - mm_install()
does it for us.
Notes
Notes:
svn path=/head/; revision=184832
Diffstat (limited to 'usr.sbin/mergemaster/mergemaster.sh')
| -rwxr-xr-x | usr.sbin/mergemaster/mergemaster.sh | 1 |
1 files changed, 0 insertions, 1 deletions
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 |