summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xusr.sbin/mergemaster/mergemaster.sh14
1 files changed, 14 insertions, 0 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh
index 91d964e..18242fb 100755
--- a/usr.sbin/mergemaster/mergemaster.sh
+++ b/usr.sbin/mergemaster/mergemaster.sh
@@ -947,6 +947,20 @@ for COMPFILE in `find . -type f -size +0`; do
echo " *** Temp ${COMPFILE} and installed have the same CVS Id, deleting"
rm "${COMPFILE}"
;;
+
+ *)
+ tempfoo=`basename $0`
+ TMPFILE1=`mktemp -t ${tempfoo}` || break
+ TMPFILE2=`mktemp -t ${tempfoo}` || break
+ sed "s/[$]${CVS_ID_TAG}:.*[$]//g" "${DESTDIR}${COMPFILE#.}" > "${TMPFILE1}"
+ sed "s/[$]${CVS_ID_TAG}:.*[$]//g" "${COMPFILE}" > "${TMPFILE2}"
+ if diff -q ${DIFF_OPTIONS} "${TMPFILE1}" "${TMPFILE2}" > \
+ /dev/null 2>&1; then
+ echo " *** Temp ${COMPFILE} and installed are the same except CVS Id, deleting"
+ rm "${COMPFILE}"
+ fi
+ rm -f "${TMPFILE1}" "${TMPFILE2}"
+ ;;
esac
;;
esac
OpenPOWER on IntegriCloud