From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 15 Feb 2007 20:21:49 +0000 (-0000)
Subject: Fix CONFIG_PROTECT_MASK support.  Thanks to piavlo <piavka@cs.bgu.ac.il> for this... 
X-Git-Tag: v2.2_pre1~1705
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d179d23193f79d933e2406705e5a4c2709d7b713;p=portage.git

Fix CONFIG_PROTECT_MASK support.  Thanks to piavlo <piavka@cs.bgu.ac.il> for this patch from bug #166837.

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

diff --git a/bin/etc-update b/bin/etc-update
index 17a008bf6..b51b1b670 100755
--- a/bin/etc-update
+++ b/bin/etc-update
@@ -60,7 +60,8 @@ function scan() {
 			rpath=$(echo "${file/\/\///}" | sed -e "s:/[^/]*$::")
 			rfile=$(echo "${file/\/\///}" | sed -e "s:^.*/::")
 			for mpath in ${CONFIG_PROTECT_MASK}; do
-				mpath="${ROOT}${path}"
+				mpath="${ROOT}${mpath}"
+				mpath=$(echo ${mpath/\/\///})
 				if [[ "${rpath}" == "${mpath}"* ]]; then
 					mv ${rpath}/${rfile} ${rpath}/${rfile:10}
 					break