From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 27 Mar 2012 17:35:44 +0000 (-0700)
Subject: etc-update: handle emacs diff cmd, bug #409849
X-Git-Tag: v2.2.0_alpha96~4
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b344222a9a4dfbd811e196bd755ccbec511d0721;p=portage.git

etc-update: handle emacs diff cmd, bug #409849
---

diff --git a/bin/etc-update b/bin/etc-update
index 794271ff4..1edc91fab 100755
--- a/bin/etc-update
+++ b/bin/etc-update
@@ -676,7 +676,9 @@ if [[ ${using_editor} == "0" ]] ; then
 		die "'${diff_command}' does not seem to work, aborting"
 	fi
 else
-	if ! cmd_var_is_valid "${diff_command}" ; then
+	# NOTE: cmd_var_is_valid doesn't work with diff_command="eval emacs..."
+	# because it uses type -P.
+	if ! type ${diff_command%%[[:space:]]*} >/dev/null; then
 		die "'${diff_command}' does not seem to work, aborting"
 	fi
 fi