From a6463231acad58175673c6928c8389dde91a6e95 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 2 Jan 2018 01:09:34 -0800 Subject: [PATCH] PreservedLibsRegistry: fix pruneNonExisting for symlinks to other dirs (bug 642672) Fixes: 32d19be14e22 ("pruneNonExisting: handle eselect-opengl symlinks") --- pym/portage/util/_dyn_libs/PreservedLibsRegistry.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pym/portage/util/_dyn_libs/PreservedLibsRegistry.py b/pym/portage/util/_dyn_libs/PreservedLibsRegistry.py index a422ffefd..f83b82a31 100644 --- a/pym/portage/util/_dyn_libs/PreservedLibsRegistry.py +++ b/pym/portage/util/_dyn_libs/PreservedLibsRegistry.py @@ -12,6 +12,7 @@ try: except ImportError: import pickle +from portage import abssymlink from portage import os from portage import _encodings from portage import _os_merge @@ -227,7 +228,7 @@ class PreservedLibsRegistry(object): # removed by _remove_preserved_libs, it calls pruneNonExisting # which eliminates the irrelevant symlink from the registry here. for f, target in symlinks.items(): - if os.path.join(os.path.dirname(f), target) in hardlinks: + if abssymlink(f, target=target) in hardlinks: paths.append(f) if len(paths) > 0: -- 2.13.6