summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Bestwalter <oliver.bestwalter@avira.com>2017-09-10 13:57:27 +0200
committerOliver Bestwalter <oliver.bestwalter@avira.com>2017-09-10 13:57:27 +0200
commitc476851e39496148e6dd3117ec6936a99d088e31 (patch)
treec59a0d9741fff12ed81ba9c2107c31de6b2ff8aa
parent952385acaf352ef6aefab17a2b4c86e5cca64d94 (diff)
downloadtox-git-2.8.2.tar.gz
#466 stop env var leakage if popen failed with resultjson or redirect2.8.2
-rw-r--r--CHANGELOG5
-rw-r--r--tox/session.py3
2 files changed, 6 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index e0c65960..fea0cf91 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+2.8.2 (2017-10-09)
+------------------
+
+#466: stop env var leakage if popen failed with resultjson or redirect
+
2.8.1 (2017-09-04)
------------------
diff --git a/tox/session.py b/tox/session.py
index 60baaeee..dee22d97 100644
--- a/tox/session.py
+++ b/tox/session.py
@@ -123,8 +123,7 @@ class Action(object):
resultjson = self.session.config.option.resultjson
if resultjson or redirect:
fout = self._initlogpath(self.id)
- fout.write("actionid: %s\nmsg: %s\ncmdargs: %r\nenv: %s\n\n" % (
- self.id, self.msg, args, env))
+ fout.write("actionid: %s\nmsg: %s\ncmdargs: %r\n\n" % (self.id, self.msg, args))
fout.flush()
self.popen_outpath = outpath = py.path.local(fout.name)
fin = outpath.open()