From: László Szalma <dblaci@dblaci.hu>
Date: Thu, 17 May 2012 20:07:52 +0000 (-0700)
Subject: merge: fix abs symlink adjustment, bug #416431
X-Git-Tag: v2.2.0_alpha108~5
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f2f4b2e3b6d7865ccef11a254055b5d213f4bac3;p=portage.git

merge: fix abs symlink adjustment, bug #416431
---

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 399bf9f99..517c873ab 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -4287,7 +4287,7 @@ class dblink(object):
 				myabsto = myabsto.lstrip(sep)
 				if self.settings and self.settings["D"]:
 					if myto.startswith(self.settings["D"]):
-						myto = myto[len(self.settings["D"]):]
+						myto = myto[len(self.settings["D"])-1:]
 				# myrealto contains the path of the real file to which this symlink points.
 				# we can simply test for existence of this file to see if the target has been merged yet
 				myrealto = normalize_path(os.path.join(destroot, myabsto))