From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
	by finch.gentoo.org with esmtp (Exim 4.60)
	(envelope-from <gentoo-commits+bounces-407005-garchives=archives.gentoo.org@lists.gentoo.org>)
	id 1RYiJS-0005Zs-0g
	for garchives@archives.gentoo.org; Thu, 08 Dec 2011 18:03:18 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 2F73A21C15B;
	Thu,  8 Dec 2011 18:03:09 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	by pigeon.gentoo.org (Postfix) with ESMTP id 0220321C164
	for <gentoo-commits@lists.gentoo.org>; Thu,  8 Dec 2011 18:03:08 +0000 (UTC)
Received: from pelican.gentoo.org (unknown [66.219.59.40])
	(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 7BC221B400F
	for <gentoo-commits@lists.gentoo.org>; Thu,  8 Dec 2011 18:03:08 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by pelican.gentoo.org (Postfix) with ESMTP id EDD4C80042
	for <gentoo-commits@lists.gentoo.org>; Thu,  8 Dec 2011 18:03:07 +0000 (UTC)
From: "Zac Medico" <zmedico@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" <zmedico@gentoo.org>
Message-ID: <f38e5fced3cf96c086093314f5227bc024c20d9b.zmedico@gentoo>
Subject: [gentoo-commits] proj/portage:master commit in: bin/
X-VCS-Repository: proj/portage
X-VCS-Files: bin/etc-update
X-VCS-Directories: bin/
X-VCS-Committer: zmedico
X-VCS-Committer-Name: Zac Medico
X-VCS-Revision: f38e5fced3cf96c086093314f5227bc024c20d9b
Date: Thu,  8 Dec 2011 18:03:07 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: 882e218b-c3e2-442c-8e37-a951c18a117b
X-Archives-Hash: cc5574bfb137a6bfbbd5177f9ea03e06

commit:     f38e5fced3cf96c086093314f5227bc024c20d9b
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  8 18:03:00 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu Dec  8 18:03:00 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a=
=3Dcommit;h=3Df38e5fce

etc-update: experimental prefix support

---
 bin/etc-update |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

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