summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorMorgan Fainberg <m@metacloud.com>2014-03-25 15:29:38 -0700
committerMorgan Fainberg <m@metacloud.com>2014-03-25 15:29:38 -0700
commit7a61fdad07cd778602f687f085eb15e235d06198 (patch)
treea22873ca0b77d42a63843505be21015580584613 /doc
parentae737eac6e792cbc6f05a527f9398876f84170c6 (diff)
downloadtox-7a61fdad07cd778602f687f085eb15e235d06198.tar.gz
Make optional env replacements use the ``env`` keyword
The ':' character is a reserved character in shell, meaning it cannot be used as part of the ENV variable name. If the ENV key has a ':' in it split on the ':' and use the second value as the default instead of raising an exception.
Diffstat (limited to 'doc')
-rw-r--r--doc/config.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/config.txt b/doc/config.txt
index 5a9134d..c53df68 100644
--- a/doc/config.txt
+++ b/doc/config.txt
@@ -298,7 +298,7 @@ environment variable substitutions with default values
If you specify a substitution string like this::
- {defenv:DEFAULTVALUE:KEY}
+ {env:KEY:DEFAULTVALUE}
then the value will be retrieved as ``os.environ['KEY']``
and replace with DEFAULTVALUE if the environment variable does not
@@ -306,7 +306,7 @@ exist.
If you specify a substitution string like this::
- {defenv::KEY}
+ {env:KEY:}
then the value will be retrieved as ``os.environ['KEY']``
and replace with and empty string if the environment variable does not