d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ignore files that only differ in CVS Id tag.

Browse Source 
MFC after:	2 weeks
This commit is contained in:
Maxim Sobolev 2008-11-09 07:58:23 +00:00
parent 8037791bf7
commit ed61c72f45
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
usr.sbin/mergemaster/mergemaster.sh
View File

@ -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