Merge pull request iovisor#489 from aaronpuchert/permissive_regex

Don't require "OS ABI" specification in libraries
PengWu-wp · Apr 17, 2016 · d604f35 · d604f35
2 parents 3e7c3d9 + 3926f26
commit d604f35
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/python/bcc/__init__.py b/src/python/bcc/__init__.py
@@ -429,7 +429,7 @@ def find_library(cls, name):
  "ia64-64": "libc6,IA-64",
  }
  abi_type = mach_map.get(machine, "libc6")
- expr = r"\s+lib%s\.[^\s]+\s+\(%s, [^)]+[^/]+([^\s]+)" % (name, abi_type)
+ expr = r"\s+lib%s\.[^\s]+\s+\(%s[^)]*[^/]+([^\s]+)" % (name, abi_type)
  with os.popen("/sbin/ldconfig -p 2>/dev/null") as f:
  data = f.read()
  res = re.search(expr, data)