diff options
author | Stefano Mazzucco <pietranera@gmail.com> | 2015-06-18 21:15:04 +0100 |
---|---|---|
committer | Stefano Mazzucco <pietranera@gmail.com> | 2015-06-18 21:15:04 +0100 |
commit | 509570015064580054a5ea0c3df3d07906433305 (patch) | |
tree | 598f157f492585a0f09c61b47f6dc4d86ab0fd8a /tox | |
parent | 8c7dbd8d2e1f03b977b0a716b0936fff5f08e37b (diff) | |
parent | e137fb2b2336f6c9f20e4789527b82cd89e502b2 (diff) | |
download | tox-509570015064580054a5ea0c3df3d07906433305.tar.gz |
merge with default
Diffstat (limited to 'tox')
-rw-r--r-- | tox/config.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tox/config.py b/tox/config.py index 5345ce3..5dba0bc 100644 --- a/tox/config.py +++ b/tox/config.py @@ -381,6 +381,11 @@ def tox_addoption(parser): help="list of X=Y lines with environment variable settings") def passenv(testenv_config, value): + if len(value) == 1 and "\n" in value[0]: + # If we have a list of 1 element that contains new lines, + # passenv has been specified as a multi line list. + value = value[0].split("\n") + passenv = set(["PATH", "PIP_INDEX_URL", "LANG"]) # we ensure that tmp directory settings are passed on |