From 3caabbed9f95de37367c0dd3b2f1e87edef471b2 Mon Sep 17 00:00:00 2001
From: Daniel Narvaez <dwnarvaez@gmail.com>
Date: Mon, 10 Dec 2012 23:51:55 +0000
Subject: Improve multilib support

---
(limited to 'devbot/system.py')

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
 
--
cgit v0.9.1