From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 12 Jul 2006 09:59:01 +0000 (-0000)
Subject: Use a safer method to join the path when deciding if the current merge offset is... 
X-Git-Tag: v2.1.1~242
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e3cd333f04906fd72bf82c48d3ef47e206aa8d8e;p=portage.git

Use a safer method to join the path when deciding if the current merge offset is config protected.  The main problem with corresponding change from r3836 is that the destroot variable happens to be // when ROOT=/.  See bug #140045.

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

diff --git a/pym/portage.py b/pym/portage.py
index dccdc706b..7a614dbd6 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -6442,7 +6442,10 @@ class dblink:
 			# We need mydest defined up here to calc. protection paths.  This is now done once per
 			# directory rather than once per file merge.  This should really help merge performance.
 			# Trailing / ensures that protects/masks with trailing /'s match.
-			mytruncpath = os.path.join(destroot, offset) + os.path.sep
+			mytruncpath = os.path.sep + \
+				os.path.join(
+					destroot.strip(os.path.sep), offset.strip(os.path.sep)) + \
+				os.path.sep
 			myppath=self.isprotected(mytruncpath)
 		else:
 			mergelist=stufftomerge