From 6c193ece694dc93eb6948f40a135457c9c85d0d6 Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 5 Apr 2007 21:20:57 +0000
Subject: Don't set os.environ["USERLAND"] inside portage.data and rely on
 USERLAND from the profile instead (bail out if necessary when USERLAND is
 unset).

svn path=/main/trunk/; revision=6341
---
 bin/etc-update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bin/etc-update')

diff --git a/bin/etc-update b/bin/etc-update
index ab376b83c..bf1d0139b 100755
--- a/bin/etc-update
+++ b/bin/etc-update
@@ -386,7 +386,7 @@ Please select from the menu above (-1 to exit, losing this merge): "
 			my_input=$(read_int)
 			case ${my_input} in
 				1) echo "Replacing ${ofile} with ${mfile}"
-				   if [[ ${USERLAND} == GNU ]]; then
+				   if [[ ${USERLAND:-GNU} == GNU ]]; then
 				       chmod --reference="${ofile}" "${mfile}"
 				   else
 				       chmod $(stat -f %Mp%Lp "${ofile}") "${mfile}"
-- 
cgit v1.2.3-1-g7c22