diff options
| author | Daniel Narvaez <dwnarvaez@gmail.com> | 2012-12-10 23:51:55 (GMT) |
|---|---|---|
| committer | Daniel Narvaez <dwnarvaez@gmail.com> | 2012-12-10 23:51:55 (GMT) |
| commit | 3caabbed9f95de37367c0dd3b2f1e87edef471b2 (patch) | |
| tree | d88e4fe957c4db88af8c7fcec3e5babff2f58308 /devbot/system.py | |
| parent | a3c3f4aec4d08d4fde6b22ec0ed81c2b98a44243 (diff) | |
Improve multilib support
Diffstat (limited to 'devbot/system.py')
| -rw-r--r-- | devbot/system.py | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/devbot/system.py b/devbot/system.py index 4652169..85e2349 100644 --- a/devbot/system.py +++ b/devbot/system.py @@ -10,11 +10,6 @@ from devbot import state from devbot import utils from devbot import xvfb -libdirs = ["lib", - "lib64", - "lib/x86_64-linux-gnu", - "lib/i386-linux-gnu"] - def check_binary(check): return subprocess.call(["which", check], stdout=utils.devnull, @@ -32,8 +27,8 @@ def check_gtkmodule(check): # Not sure we can do better than this, the gtkmodule stuff is private missing = True - for libdir in libdirs: - if os.path.exists("/usr/%s/gtk-2.0/modules/lib%s.so" % (libdir, check)): + for libdir in config.system_lib_dirs: + if os.path.exists("%s/gtk-2.0/modules/lib%s.so" % (libdir, check)): missing = False return missing @@ -50,8 +45,8 @@ def check_metacity_theme(check): def check_gstreamer(check, version): missing = True - for libdir in libdirs: - if os.path.exists("/usr/%s/gstreamer-%s/libgst%s.so" % \ + for libdir in config.system_lib_dirs: + if os.path.exists("%s/gstreamer-%s/libgst%s.so" % \ (libdir, version, check)): missing = False |