diff options
| author | Daniel Narvaez <dwnarvaez@gmail.com> | 2012-11-13 12:49:54 (GMT) |
|---|---|---|
| committer | Daniel Narvaez <dwnarvaez@gmail.com> | 2012-11-13 12:49:54 (GMT) |
| commit | 366bb2c0cfd02e0cf121f2df4cf501845af52379 (patch) | |
| tree | 400511a18f4e8abef8f37014e7691aece2f83b39 | |
| parent | b535604d1214c091a40246cad23bde26af23f3e4 (diff) | |
Work around missing dependency of gst typelib package
https://bugs.launchpad.net/ubuntu/+source/gstreamer1.0/+bug/1078267
| -rwxr-xr-x | scripts/check-system | 13 | ||||
| -rw-r--r-- | scripts/deps/packages-3.6.json | 3 | ||||
| -rw-r--r-- | scripts/deps/sugar-runtime-3.6.json | 2 |
3 files changed, 11 insertions, 7 deletions
diff --git a/scripts/check-system b/scripts/check-system index bb76d93..9023ad9 100755 --- a/scripts/check-system +++ b/scripts/check-system @@ -100,11 +100,14 @@ def run_checks(distro, checks, packages): if checker(check["check"]): check_name = check.get("check_name", check["check"]) if distro in packages[check_name]: - package = packages[check_name][distro] - - # Might be none, if so skip on this distro - if package and package not in packages: - to_install.append(package) + package_list = packages[check_name][distro] + if not isinstance(package_list, list): + package_list = [package_list] + + for package in package_list: + # Might be none, if so skip on this distro + if package and package not in packages: + to_install.append(package) else: failed_checks.append(check) diff --git a/scripts/deps/packages-3.6.json b/scripts/deps/packages-3.6.json index 7a322b5..4fb5a5e 100644 --- a/scripts/deps/packages-3.6.json +++ b/scripts/deps/packages-3.6.json @@ -132,7 +132,8 @@ "ubuntu": "gir1.2-gconf-2.0" }, "gst typelib": { "fedora": "gstreamer", - "ubuntu": "gir1.2-gstreamer-1.0" }, + "ubuntu": ["gir1.2-gstreamer-1.0", + "libgstreamer-1.0-0"] }, "wnck typelib": { "fedora": "libwnck3", "ubuntu": "gir1.2-wnck-3.0" }, diff --git a/scripts/deps/sugar-runtime-3.6.json b/scripts/deps/sugar-runtime-3.6.json index 29109f2..5ad43eb 100644 --- a/scripts/deps/sugar-runtime-3.6.json +++ b/scripts/deps/sugar-runtime-3.6.json @@ -50,7 +50,7 @@ "check": "from gi.repository import GConf", "checker": "python" }, { "check_name": "gst typelib", - "check": "import gi; gi.require_version('Gst', '1.0'); from gi.repository import Gst", + "check": "import gi; gi.require_version('Gst', '1.0'); from gi.repository import Gst; Gst.init([])", "checker": "python" }, { "check_name": "wnck typelib", "check": "from gi.repository import Wnck", |