D7401.1794764595.diff
No OneTemporary
Actions

Authored By

Unknown

Size

1 KB

Referenced Files

None

Subscribers

None

D7401.1794764595.diff
View Options

	Index: head/usr.sbin/etcupdate/etcupdate.sh
	===================================================================
	--- head/usr.sbin/etcupdate/etcupdate.sh
	+++ head/usr.sbin/etcupdate/etcupdate.sh
	@@ -814,15 +814,17 @@
	local res

	# Try the merge to see if there is a conflict.
	- merge -q -p ${DESTDIR}$1 ${OLDTREE}$1 ${NEWTREE}$1 >/dev/null 2>&3
	+ diff3 -E -m ${DESTDIR}$1 ${OLDTREE}$1 ${NEWTREE}$1 > /dev/null 2>&3
	res=$?
	case $res in
	0)
	# No conflicts, so just redo the merge to the
	# real file.
	- log "merge ${DESTDIR}$1 ${OLDTREE}$1 ${NEWTREE}$1"
	+ log "diff3 -E -m ${DESTDIR}$1 ${OLDTREE}$1 ${NEWTREE}$1"
	if [ -z "$dryrun" ]; then
	- merge ${DESTDIR}$1 ${OLDTREE}$1 ${NEWTREE}$1
	+ temp=$(mktemp -t etcupdate)
	+ diff3 -E -m ${DESTDIR}$1 ${OLDTREE}$1 ${NEWTREE}$1 > ${temp}
	+ mv -f ${temp} ${DESTDIR}$1
	fi
	post_install_file $1
	echo " M $1"
	@@ -832,10 +834,10 @@
	# the conflicts directory.
	if [ -z "$dryrun" ]; then
	install_dirs $NEWTREE $CONFLICTS $1
	- log "cp -Rp ${DESTDIR}$1 ${CONFLICTS}$1"
	- cp -Rp ${DESTDIR}$1 ${CONFLICTS}$1 >&3 2>&1
	- merge -A -q -L "yours" -L "original" -L "new" \
	- ${CONFLICTS}$1 ${OLDTREE}$1 ${NEWTREE}$1
	+ log "diff3 -m -A ${DESTDIR}$1 ${CONFLICTS}$1"
	+ diff3 -m -A -L "yours" -L "original" -L "new" \
	+ ${DESTDIR}$1 ${OLDTREE}$1 ${NEWTREE}$1 > \
	+ ${CONFLICTS}$1
	fi
	echo " C $1"
	;;