From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 20 Jul 2006 21:47:47 +0000 (-0000)
Subject: Fix broken if/elif statement.
X-Git-Tag: v2.1.1~169
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8c4a9f07fe5547ee51fbbf4fb919a6b50c97c312;p=portage.git

Fix broken if/elif statement.

svn path=/main/trunk/; revision=3972
---

diff --git a/bin/etc-update b/bin/etc-update
index 8e2cf51b6..a421d973a 100755
--- a/bin/etc-update
+++ b/bin/etc-update
@@ -272,9 +272,9 @@ function do_cfg() {
 	local -i my_input=0
 	
 	until (( ${my_input} == -1 )) || [ ! -f ${file} ]; do
-		if [[ "${OVERWRITE_ALL}" == "yes" && ! user_special ${ofile} ]]; then
+		if [[ "${OVERWRITE_ALL}" == "yes" ]] && ! user_special "${ofile}"; then
 			my_input=1
-		elif [[ "${DELETE_ALL}" == "yes" && ! user_special ${ofile} ]]; then
+		elif [[ "${DELETE_ALL}" == "yes" ]] && ! user_special "${ofile}"; then
 			my_input=2
 		else
 		  showdiffcmd=$(echo "${diff_command}" |