summaryrefslogtreecommitdiffstats
path: root/Lib/subprocess.py
diff options
context:
space:
mode:
authorStefan Krah <stefan@bytereef.org>2010-07-19 14:39:36 (GMT)
committerStefan Krah <stefan@bytereef.org>2010-07-19 14:39:36 (GMT)
commit8db99c899591ecfe49405334a6e21bfa46ec8ef6 (patch)
treea9f655dfcb23c484b092e9134c58fdd353edb98a /Lib/subprocess.py
parent5bf0664175909eba6a0f440e2b2f8d4d227bb992 (diff)
downloadcpython-8db99c899591ecfe49405334a6e21bfa46ec8ef6.zip
cpython-8db99c899591ecfe49405334a6e21bfa46ec8ef6.tar.gz
cpython-8db99c899591ecfe49405334a6e21bfa46ec8ef6.tar.bz2
Merged revisions 82971 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r82971 | stefan.krah | 2010-07-19 16:20:53 +0200 (Mon, 19 Jul 2010) | 4 lines Issue #9265: Incorrect name passed as arg[0] when shell=True and executable specified. ........
Diffstat (limited to 'Lib/subprocess.py')
-rw-r--r--Lib/subprocess.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/Lib/subprocess.py b/Lib/subprocess.py
index 1b774bc..d19e538 100644
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -1044,6 +1044,8 @@ class Popen(object):
if shell:
args = ["/bin/sh", "-c"] + args
+ if executable:
+ args[0] = executable
if executable is None:
executable = args[0]