diff --git a/libraries/entropy.py b/libraries/entropy.py index b54c8cf32..d41aa7e6c 100644 --- a/libraries/entropy.py +++ b/libraries/entropy.py @@ -517,6 +517,7 @@ class EquoInterface(TextInterface): return (),(),-1 ldpaths = self.entropyTools.collectLinkerPaths() + ldpaths |= self.entropyTools.collectPaths() # speed up when /usr/lib is a /usr/lib64 symlink if "/usr/lib64" in ldpaths and "/usr/lib" in ldpaths: if os.path.realpath("/usr/lib64") == "/usr/lib": diff --git a/libraries/entropyTools.py b/libraries/entropyTools.py index 55e2603ba..140dfd9de 100644 --- a/libraries/entropyTools.py +++ b/libraries/entropyTools.py @@ -2239,6 +2239,14 @@ def collectLinkerPaths(): linkerPaths.update(ldpaths) return ldpaths +def collectPaths(): + path = set() + paths = os.getenv("PATH") + if paths != None: + paths = set(paths.split(":")) + path |= paths + return path + # this is especially used to try to guess portage bytecoded entries in CONTENTS def string_to_utf8(string): done = False