Change in vdsm[master]: Remove __init__.py file from lib64 vdsm python directory

nsoffer at redhat.com nsoffer at redhat.com
Sun Jan 10 20:51:23 UTC 2016


Nir Soffer has submitted this change and it was merged.

Change subject: Remove __init__.py file from lib64 vdsm python directory
......................................................................


Remove __init__.py file from lib64 vdsm python directory

During upgrade from vdsm-4.14 we restart supervdsmd service.
sys.path is configured to load py modules from /usr/lib64 before
 /usr/lib. Therefore super loads the vdsm lib module from
old location (/usr/lib64/python2.7/site-packages) before it's removed.
(instead of the new location /usr/lib/python2.7/site-packages -
was introduced in https://gerrit.ovirt.org/#/c/33711)

This patch removes the old vdsm/__init__.py* files in post scriptlet
which prevents the wrong import.

Change-Id: I9dc611cfad83739af3d0706570420cb6dc9630c4
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1279167
Signed-off-by: Yeela Kaplan <ykaplan at redhat.com>
Signed-off-by: Yaniv Bronhaim <ybronhei at redhat.com>
Reviewed-on: https://gerrit.ovirt.org/50115
Continuous-Integration: Jenkins CI
Reviewed-by: Dan Kenigsberg <danken at redhat.com>
---
M vdsm.spec.in
1 file changed, 13 insertions(+), 0 deletions(-)

Approvals:
  Yaniv Bronhaim: Verified
  Jenkins CI: Passed CI tests
  Dan Kenigsberg: Looks good to me, approved



-- 
To view, visit https://gerrit.ovirt.org/50115
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I9dc611cfad83739af3d0706570420cb6dc9630c4
Gerrit-PatchSet: 12
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yeela Kaplan <ykaplan at redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken at redhat.com>
Gerrit-Reviewer: Fabian Deutsch <fabiand at redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer <nsoffer at redhat.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei at redhat.com>
Gerrit-Reviewer: Yeela Kaplan <ykaplan at redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation at ovirt.org>


More information about the vdsm-patches mailing list