D29845.diff
No OneTemporary
Actions

Size

767 B

Referenced Files

None

Subscribers

None

D29845.diff
View Options

	diff --git a/usr.sbin/etcupdate/etcupdate.sh b/usr.sbin/etcupdate/etcupdate.sh
	--- a/usr.sbin/etcupdate/etcupdate.sh
	+++ b/usr.sbin/etcupdate/etcupdate.sh
	@@ -442,7 +442,7 @@
	#
	# $1 - first tree
	# $2 - second tree
	-# $3 - node name
	+# $3 - node name
	# $4 - label for first tree
	# $5 - label for second tree
	diffnode()
	@@ -867,7 +867,7 @@
	# $1 - pathname of the file to resolve (relative to DESTDIR)
	has_conflicts()
	{
	-
	+
	egrep -q '^(<{7}\|\\|{7}\|={7}\|>{7}) ' $CONFLICTS/$1
	}

	@@ -1526,7 +1526,7 @@
	if [ -n "$preworld" ]; then
	> $WORKDIR/removed.files
	fi
	-
	+
	# The order for the following sections is important. In the
	# odd case that a directory is converted into a file, the
	# existing subfiles need to be removed if possible before the