From Yaniv Bronhaim <[email protected]>: Yaniv Bronhaim has uploaded a new change for review.
Change subject: Fix gluster files installation after upgrade ...................................................................... Fix gluster files installation after upgrade In https://gerrit.ovirt.org/#/c/57530/15/vdsm.spec.in we changed vdsm package files to install the files under site-packages. This conflicts with the declaration in vdsm-python files which attemp to install the same gluster folder and part of the files. This patch moves all the installation of vdsm gluster lib files to vdsm-python which includes basically all vdsm lib folder so this is the right location for lib/gluster in vdsm spec. Change-Id: I1303651c165b05c092e587b3df15a54776ff2f9d Signed-off-by: Yaniv Bronhaim <[email protected]> --- M vdsm.spec.in 1 file changed, 1 insertion(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/77/67777/1 diff --git a/vdsm.spec.in b/vdsm.spec.in index 6de55ec..0e38d77 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -1050,9 +1050,6 @@ %{_datadir}/%{vdsm_name}/get-conf-item %{_datadir}/%{vdsm_name}/set-conf-item -%dir %{python_sitelib}/%{vdsm_name}/gluster -%{python_sitelib}/%{vdsm_name}/gluster/__init__.py* -%{python_sitelib}/%{vdsm_name}/gluster/cli.py* %{python_sitelib}/sos/plugins/vdsm.py* %{_udevrulesdir}/12-vdsm-lvm.rules /etc/security/limits.d/99-vdsm.conf @@ -1131,6 +1128,7 @@ # gluster.exception is used in many places like Bridge.py. So it is required # even without vdsm-gluster package %{python_sitelib}/%{vdsm_name}/gluster/__init__.py* +%{python_sitelib}/%{vdsm_name}/gluster/cli.py* %{python_sitelib}/%{vdsm_name}/gluster/exception.py* %{python_sitelib}/%{vdsm_name}/health.py* %{python_sitelib}/%{vdsm_name}/hooks.py* -- To view, visit https://gerrit.ovirt.org/67777 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1303651c165b05c092e587b3df15a54776ff2f9d Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim <[email protected]> _______________________________________________ vdsm-patches mailing list -- [email protected] To unsubscribe send an email to [email protected]
