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/plugins | |
| parent | a3c3f4aec4d08d4fde6b22ec0ed81c2b98a44243 (diff) | |
Improve multilib support
Diffstat (limited to 'devbot/plugins')
| -rw-r--r-- | devbot/plugins/debian.py | 7 | ||||
| -rw-r--r-- | devbot/plugins/fedora.py | 5 | ||||
| -rw-r--r-- | devbot/plugins/interfaces.py | 6 | ||||
| -rw-r--r-- | devbot/plugins/ubuntu.py | 7 | ||||
| -rw-r--r-- | devbot/plugins/unknown.py | 2 |
5 files changed, 21 insertions, 6 deletions
diff --git a/devbot/plugins/debian.py b/devbot/plugins/debian.py index 0b340e8..53e6bc4 100644 --- a/devbot/plugins/debian.py +++ b/devbot/plugins/debian.py @@ -94,7 +94,12 @@ class DistroInfo(interfaces.DistroInfo): self.gstreamer_version = "0.10" self.valid = True self.supported = (arch in ["i686", "x86_64"]) - self.use_lib64 = False + self.lib_dir = None + + if arch == "i686": + self.lib_dir = "lib/i386-linux-gnu" + elif arch == "x86_64": + self.lib_dir = "lib/x86_64-linux-gnu" try: with open(self._DEBIAN_VERSION_PATH) as f: diff --git a/devbot/plugins/fedora.py b/devbot/plugins/fedora.py index 862ca81..df0aef7 100644 --- a/devbot/plugins/fedora.py +++ b/devbot/plugins/fedora.py @@ -91,9 +91,12 @@ class DistroInfo(interfaces.DistroInfo): self.version = "unknown" self.gnome_version = "3.6" self.gstreamer_version = "1.0" - self.use_lib64 = (arch == "x86_64") self.valid = True self.supported = (arch in ["i386", "i686", "x86_64"]) + self.lib_dir = None + + if arch == "x86_64": + self.lib_dir = "lib64" try: release = open(self._FEDORA_RELEASE_PATH).read().strip() diff --git a/devbot/plugins/interfaces.py b/devbot/plugins/interfaces.py index d8659bf..8c97c65 100644 --- a/devbot/plugins/interfaces.py +++ b/devbot/plugins/interfaces.py @@ -54,8 +54,10 @@ class DistroInfo: attributes are all valid. """ - self.use_lib64 = False - """If set to True install libraries in the lib64 directory.""" + self.lib_dir = False + """Path to the architecture specific lib directory, relative + to the prefix. + """ self.supported = False """If set to Trye the distribution is supported.""" diff --git a/devbot/plugins/ubuntu.py b/devbot/plugins/ubuntu.py index 140d8ad..005871c 100644 --- a/devbot/plugins/ubuntu.py +++ b/devbot/plugins/ubuntu.py @@ -17,7 +17,12 @@ class DistroInfo(interfaces.DistroInfo): self.gstreamer_version = "1.0" self.valid = True self.supported = (arch in ["i386", "i686", "x86_64"]) - self.use_lib64 = False + self.lib_dir = None + + if arch in ["i386", "i686"]: + self.lib_dir = "lib/i386-linux-gnu" + elif arch == "x86_64": + self.lib_dir = "lib/x86_64-linux-gnu" try: release = open(self._OS_RELEASE_PATH).read().strip() diff --git a/devbot/plugins/unknown.py b/devbot/plugins/unknown.py index 8589ef6..576edef 100644 --- a/devbot/plugins/unknown.py +++ b/devbot/plugins/unknown.py @@ -28,7 +28,7 @@ distro.register_package_manager("unknown", PackageManager) class DistroInfo(interfaces.DistroInfo): def __init__(self): - self.use_lib64 = os.path.exists("/usr/lib64") + self.lib_dir = None self.name = "unknown" self.version = "unknown" self.gnome_version = "3.4" |