From f2f4b2e3b6d7865ccef11a254055b5d213f4bac3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?L=C3=A1szl=C3=B3=20Szalma?= Date: Thu, 17 May 2012 13:07:52 -0700 Subject: [PATCH] merge: fix abs symlink adjustment, bug #416431 --- pym/portage/dbapi/vartree.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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)) -- 2.26.2