diff options
author | László Szalma <dblaci@dblaci.hu> | 2012-05-17 13:07:52 -0700 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2012-05-17 13:07:52 -0700 |
commit | f2f4b2e3b6d7865ccef11a254055b5d213f4bac3 (patch) | |
tree | 805d7acbd63489747354bd99fe349bb74246cff1 | |
parent | 40160122bee77d1c34ed05157546c9d72eadd368 (diff) | |
download | portage-f2f4b2e3b6d7865ccef11a254055b5d213f4bac3.tar.gz portage-f2f4b2e3b6d7865ccef11a254055b5d213f4bac3.tar.bz2 portage-f2f4b2e3b6d7865ccef11a254055b5d213f4bac3.zip |
merge: fix abs symlink adjustment, bug #416431
-rw-r--r-- | pym/portage/dbapi/vartree.py | 2 |
1 files changed, 1 insertions, 1 deletions
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)) |