diff --git a/avocado/plugins/exec_path.py b/avocado/plugins/exec_path.py index 5701bc89334bbe8b0a6319c174638188f4df89de..d050ea379bc6d4f4941411dce372764dadc659fe 100644 --- a/avocado/plugins/exec_path.py +++ b/avocado/plugins/exec_path.py @@ -14,6 +14,8 @@ Libexec PATHs modifier """ +import os + from pkg_resources import resource_filename from avocado.core.output import LOG_UI from avocado.core.plugin_interfaces import CLICmd @@ -34,4 +36,8 @@ class ExecPath(CLICmd): :param args: Command line args received from the run subparser. """ - LOG_UI.debug(resource_filename("avocado", "libexec")) + system_wide = '/usr/libexec/avocado' + if os.path.isdir(system_wide): + LOG_UI.debug(system_wide) + else: + LOG_UI.debug(resource_filename("avocado", "libexec")) diff --git a/python-avocado.spec b/python-avocado.spec index aa5d38248b400492051571ad08c75ab8b2dafe82..4f6ad651a9bc61bb2cf06d899e8b8be88e200611 100644 --- a/python-avocado.spec +++ b/python-avocado.spec @@ -203,8 +203,8 @@ popd %{__cp} -r examples/yaml_to_mux %{buildroot}%{_datadir}/avocado %{__cp} -r examples/yaml_to_mux_loader %{buildroot}%{_datadir}/avocado %{__cp} -r examples/varianter_pict %{buildroot}%{_datadir}/avocado -%{__mkdir} -p %{buildroot}%{_libexecdir}/ -ln -s %{python_sitelib}/avocado/libexec/ %{buildroot}%{_libexecdir}/avocado +%{__mkdir} -p %{buildroot}%{_libexecdir}/avocado +%{__mv} %{buildroot}%{python_sitelib}/avocado/libexec/* %{buildroot}%{_libexecdir}/avocado %check %if %{with_tests} @@ -479,7 +479,6 @@ A small set of utilities to interact with Avocado from the Bourne Again Shell code (and possibly other similar shells). %files bash -%{python_sitelib}/avocado/libexec* %{_libexecdir}/avocado* %changelog @@ -488,6 +487,7 @@ Again Shell code (and possibly other similar shells). - Removed extra dependencies on Fedora 24 for runner-remote - Added python-avocado requirement for golang plugin - Added new common sub-package +- Make bash package independent of Python version * Thu Mar 8 2018 Cleber Rosa - 59.0-1 - Remove backward compatibility with name avocado