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
This commit is contained in:
@@ -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":
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user