From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 8 Dec 2011 18:03:00 +0000 (-0800)
Subject: etc-update: experimental prefix support
X-Git-Tag: v2.2.0_alpha80~55
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f38e5fced3cf96c086093314f5227bc024c20d9b;p=portage.git

etc-update: experimental prefix support
---

diff --git a/bin/etc-update b/bin/etc-update
index 2af04cc4c..5a7ba2a60 100755
--- a/bin/etc-update
+++ b/bin/etc-update
@@ -54,7 +54,7 @@ scan() {
 	local my_basename
 
 	for path in ${CONFIG_PROTECT} ; do
-		path="${ROOT}${path}"
+		path="${EROOT}${path}"
 		# Do not traverse hidden directories such as .svn or .git.
 		find_opts="-name .* -type d -prune -o -name ._cfg????_*"
 		if [ ! -d "${path}" ]; then
@@ -74,7 +74,7 @@ scan() {
 			rpath=$(echo "${file/\/\///}" | sed -e "s:/[^/]*$::")
 			rfile=$(echo "${file/\/\///}" | sed -e "s:^.*/::")
 			for mpath in ${CONFIG_PROTECT_MASK}; do
-				mpath="${ROOT}${mpath}"
+				mpath="${EROOT}${mpath}"
 				mpath=$(echo "${mpath/\/\///}")
 				if [[ "${rpath}" == "${mpath}"* ]]; then
 					mv ${rpath}/${rfile} ${rpath}/${rfile:10}
@@ -537,7 +537,7 @@ ${SET_X} && set -x
 
 type portageq > /dev/null || exit $?
 eval $(portageq envvar -v CONFIG_PROTECT \
-	CONFIG_PROTECT_MASK PORTAGE_CONFIGROOT PORTAGE_TMPDIR ROOT USERLAND)
+	CONFIG_PROTECT_MASK PORTAGE_CONFIGROOT PORTAGE_TMPDIR EROOT USERLAND)
 export PORTAGE_TMPDIR
 
 TMP="${PORTAGE_TMPDIR}/etc-update-$$"