diff --git a/jhbuild/utils/systeminstall.py b/jhbuild/utils/systeminstall.py index d8916bfb85f51a2a8d083d56b3bbcf0cc1ab156c..868b34ab5dd5810079566ad7b86fd338706a0ba9 100644 --- a/jhbuild/utils/systeminstall.py +++ b/jhbuild/utils/systeminstall.py @@ -24,6 +24,7 @@ import shlex import subprocess import pipes import imp +import textwrap import time from StringIO import StringIO @@ -180,6 +181,20 @@ def systemdependencies_met(module_name, sysdeps, config): except: dep_met = False + elif dep_type == 'python3': + python3_script = textwrap.dedent(''' + import imp + import sys + try: + imp.find_module(sys.argv[1]) + except: + exit(1) + ''').strip('\n') + try: + subprocess.check_call(['python3', '-c', python3_script, value]) + except (subprocess.CalledProcessError, OSError): + dep_met = False + elif dep_type == 'xml': xml_catalog = '/etc/xml/catalog' diff --git a/modulesets/gnome-suites-core-deps-latest.modules b/modulesets/gnome-suites-core-deps-latest.modules index 9c9dbca933310ab39e19daf58a04b8cdcad3cf24..dd9ec66782789e14f459f2ef459477eedfdbbb21 100644 --- a/modulesets/gnome-suites-core-deps-latest.modules +++ b/modulesets/gnome-suites-core-deps-latest.modules @@ -1003,6 +1003,7 @@ + diff --git a/modulesets/gnome-sysdeps-latest.modules b/modulesets/gnome-sysdeps-latest.modules index d5998b353339b20ede2f694e998a4e0c9a55a1c1..ad8513b9208a01966eec76895e0eb4165b3577a4 100644 --- a/modulesets/gnome-sysdeps-latest.modules +++ b/modulesets/gnome-sysdeps-latest.modules @@ -1096,6 +1096,13 @@ version="3.2"/> + + + + + + +