[prev in list] [next in list] [prev in thread] [next in thread]
List: xen-cvs
Subject: [Xen-changelog] [xen-unstable] xend: enable environment passing in xPopen3
From: Xen patchbot-unstable <patchbot () xen ! org>
Date: 2012-11-23 16:44:09
Message-ID: E1TbwML-0000XH-M3 () xenbits ! xen ! org
[Download RAW message or body]
# HG changeset patch
# User Olaf Hering <olaf@aepfle.de>
# Date 1353668775 0
# Node ID 0049de3827bcfe3488dc6c7b7a60327a562aee5c
# Parent d76b7afc36afa2d92610b19a43696afe54c67224
xend: enable environment passing in xPopen3
In changeset 19990:38dd208e1d95 a new parameter 'env' was added to
xPopen3, but no code was added to actually pass the environment down to
execvpe. Also, the new code was unreachable.
Signed-off-by: Olaf Hering <olaf@aepfle.de>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Committed-by: Ian Campbell <ian.campbell@citrix.com>
---
diff -r d76b7afc36af -r 0049de3827bc tools/python/xen/util/xpopen.py
--- a/tools/python/xen/util/xpopen.py Fri Nov 23 11:06:14 2012 +0000
+++ b/tools/python/xen/util/xpopen.py Fri Nov 23 11:06:15 2012 +0000
@@ -104,7 +104,7 @@ class xPopen3:
os.dup2(c2pwrite, 1)
if capturestderr:
os.dup2(errin, 2)
- self._run_child(cmd)
+ self._run_child(cmd, env)
os.close(p2cread)
self.tochild = os.fdopen(p2cwrite, 'w', bufsize)
os.close(c2pwrite)
@@ -116,7 +116,7 @@ class xPopen3:
self.childerr = None
_active.append(self)
- def _run_child(self, cmd):
+ def _run_child(self, cmd, env):
if isinstance(cmd, basestring):
cmd = ['/bin/sh', '-c', cmd]
for i in range(3, MAXFD):
@@ -127,7 +127,6 @@ class xPopen3:
except OSError:
pass
try:
- os.execvp(cmd[0], cmd)
if env is None:
os.execvp(cmd[0], cmd)
else:
_______________________________________________
Xen-changelog mailing list
Xen-changelog@lists.xen.org
http://lists.xensource.com/xen-changelog
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic