Change in vdsm[master]: infra: Rearrange PYTHONPATH for remoteFileHandler

smizrahi at redhat.com smizrahi at redhat.com
Thu May 9 19:37:21 UTC 2013


Saggi Mizrahi has uploaded a new change for review.

Change subject: infra: Rearrange PYTHONPATH for remoteFileHandler
......................................................................

infra: Rearrange PYTHONPATH for remoteFileHandler

When running tests P_VDSM is set to $GIT_ROOT which makes "import vdsm"
conflict. This makes sure we only take from the root dir in case there
is no other alternative.

Change-Id: Id4eed6fb94686d4e77a23e0d3b6505bb4bd439cd
Signed-off-by: Saggi Mizrahi <smizrahi at redhat.com>
---
M vdsm/storage/remoteFileHandler.py
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/27/14627/1

diff --git a/vdsm/storage/remoteFileHandler.py b/vdsm/storage/remoteFileHandler.py
index bd3f8b7..fbd8316 100644
--- a/vdsm/storage/remoteFileHandler.py
+++ b/vdsm/storage/remoteFileHandler.py
@@ -227,7 +227,9 @@
             # Some imports in vdsm assume /usr/share/vdsm is in your PYTHONPATH
             env = os.environ.copy()
             env['PYTHONPATH'] = "%s:%s" % (
-                constants.P_VDSM, env.get("PYTHONPATH", ""))
+                env.get("PYTHONPATH", ""), constants.P_VDSM)
+            env['PYTHONPATH'] = ":".join(map(os.path.abspath,
+                                             env['PYTHONPATH'].split(":")))
             self.process = BetterPopen([constants.EXT_PYTHON, __file__,
                                        str(hisRead), str(hisWrite)],
                                        close_fds=False, env=env)


--
To view, visit http://gerrit.ovirt.org/14627
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id4eed6fb94686d4e77a23e0d3b6505bb4bd439cd
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Saggi Mizrahi <smizrahi at redhat.com>


More information about the vdsm-patches mailing list