diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2012-01-03 13:59:25 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-01-03 13:59:25 -0800 |
| commit | f132600314270f5fbbd168d941566d0fd877eb18 (patch) | |
| tree | 68d77417fab45792a38d45a14e93ba4432925ff5 /pym | |
| parent | Support include directives in ld.so.conf. (diff) | |
| download | portage-f132600314270f5fbbd168d941566d0fd877eb18.tar.gz portage-f132600314270f5fbbd168d941566d0fd877eb18.tar.bz2 portage-f132600314270f5fbbd168d941566d0fd877eb18.zip | |
getlibpaths: regex for include
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage/util/__init__.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pym/portage/util/__init__.py b/pym/portage/util/__init__.py index db8eb94b1..58501dca6 100644 --- a/pym/portage/util/__init__.py +++ b/pym/portage/util/__init__.py @@ -1596,11 +1596,15 @@ def find_updated_config_files(target_root, config_protect): else: yield (x, None) +_ld_so_include_re = re.compile(r'^include\s+(\S.*)') + def getlibpaths(root, env=None): def read_ld_so_conf(path): for l in grabfile(path): - if l.startswith('include '): - subpath = os.path.join(os.path.dirname(path), l[8:].strip()) + include_match = _ld_so_include_re.match(l) + if include_match is not None: + subpath = os.path.join(os.path.dirname(path), + include_match.group(1)) for p in glob.glob(subpath): for r in read_ld_so_conf(p): yield r |