From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 3 Nov 2007 22:50:59 +0000 (-0000)
Subject: if mode=1 and `dialog` is not usable, abort #197990 by DominikBuerkle
X-Git-Tag: v2.1.3.19~17
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1aed24e1532d22b9a7ef1cdb579e410e91f5a081;p=portage.git

if mode=1 and `dialog` is not usable, abort #197990 by DominikBuerkle
(trunk r8402)

svn path=/main/branches/2.1.2/; revision=8406
---

diff --git a/bin/etc-update b/bin/etc-update
index 7239ed07b..bb1160a31 100755
--- a/bin/etc-update
+++ b/bin/etc-update
@@ -541,6 +541,13 @@ else
 	fi
 fi
 
+if [[ ${mode} == "1" ]] ; then
+	if ! type dialog >/dev/null || ! dialog --help >/dev/null ; then
+		echo "ERROR: mode=1 and 'dialog' not found or not executable, aborting"
+		exit 1
+	fi
+fi
+
 #echo "rm_opts: $rm_opts, mv_opts: $mv_opts, cp_opts: $cp_opts"
 #echo "pager: $pager, diff_command: $diff_command, merge_command: $merge_command"