diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-06-29 20:36:07 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-06-29 20:36:07 -0700 |
| commit | cad462a63a79438f1666b41a61631de2de4a6163 (patch) | |
| tree | 65982cbb54eb0e4fcc0ccb8a358dcab22576d76e /pym/portage/util/__init__.py | |
| parent | d0c628f34a1789e3fc9e41c2cbc69926e8ada7b9 (diff) | |
| download | portage-cad462a63a79438f1666b41a61631de2de4a6163.tar.gz portage-cad462a63a79438f1666b41a61631de2de4a6163.tar.bz2 portage-cad462a63a79438f1666b41a61631de2de4a6163.zip | |
Only create soname symlinks in global libdirs.
This prevents false positives for private libraries installed by
pre-built packages under /opt.
Diffstat (limited to 'pym/portage/util/__init__.py')
| -rw-r--r-- | pym/portage/util/__init__.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pym/portage/util/__init__.py b/pym/portage/util/__init__.py index 31a808b0c..f877362cd 100644 --- a/pym/portage/util/__init__.py +++ b/pym/portage/util/__init__.py @@ -1567,11 +1567,12 @@ def find_updated_config_files(target_root, config_protect): else: yield (x, None) -def getlibpaths(root): +def getlibpaths(root, env=None): """ Return a list of paths that are used for library lookups """ - + if env is None: + env = os.environ # the following is based on the information from ld.so(8) - rval = os.environ.get("LD_LIBRARY_PATH", "").split(":") + rval = env.get("LD_LIBRARY_PATH", "").split(":") rval.extend(grabfile(os.path.join(root, "etc", "ld.so.conf"))) rval.append("/usr/lib") rval.append("/lib") |