merge: fix abs symlink adjustment, bug #416431
authorLászló Szalma <dblaci@dblaci.hu>
Thu, 17 May 2012 20:07:52 +0000 (13:07 -0700)
committerZac Medico <zmedico@gentoo.org>
Thu, 17 May 2012 20:07:52 +0000 (13:07 -0700)
pym/portage/dbapi/vartree.py

index 399bf9f99c2ecfc85b123725f71dda43830caf93..517c873ab0371691280c419bf3af92288d6cc2ac 100644 (file)
@@ -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))