From 413cbef42f524be4c6ec5dc0f9e06518a67e9b4a Mon Sep 17 00:00:00 2001 From: "(no author)" <(no author)@cd1c1023-2f26-0410-ae45-c471fc1f0318> Date: Tue, 11 Mar 2008 16:29:06 +0000 Subject: [PATCH] libtest must also use /usr/kde/3.5/bin:/usr/local/bin:/usr/bin:/bin:/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.1.2:/opt/blackdown-jdk-1.4.2.03/bin:/opt/blackdown-jdk-1.4.2.03/jre/bin:/usr/qt/3/bin:/usr/games/bin:/opt/vmware/workstation/bin git-svn-id: http://svn.sabayonlinux.org/projects/entropy/trunk@1448 cd1c1023-2f26-0410-ae45-c471fc1f0318 --- libraries/entropy.py | 1 + libraries/entropyTools.py | 8 ++++++++ 2 files changed, 9 insertions(+) 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