summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@gmail.com>2014-09-24 10:15:51 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2014-09-24 12:19:29 +0100
commit69e12a2ed58deff50986ee56d8a0737376531254 (patch)
treed508cd444f4f5de7399bd244a7e71985820dc9e0
parent1f76a895f5bc61e433c64e86ac17e9426cc4d5b8 (diff)
downloadmorph-69e12a2ed58deff50986ee56d8a0737376531254.tar.gz
Safely interpolate in environment variable reporting
The msg parameter to status is a format string. If we pass a string directly to it, then we have to be careful to escape any formatting characters. However, we can just do the interpolation directly in the status call instead, which is less code.
-rw-r--r--morphlib/util.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/morphlib/util.py b/morphlib/util.py
index ae1df56a..dc3dd474 100644
--- a/morphlib/util.py
+++ b/morphlib/util.py
@@ -228,8 +228,8 @@ def log_environment_changes(app, current_env, previous_env): # pragma: no cover
value_msg = '(value hidden)'
else:
value_msg = '= "%s"' % value
- msg = '%s environment variable %s %s' % (event, key, value_msg)
- app.status(msg=msg, chatty=True)
+ app.status(msg='%(event)s environment variable %(key)s %(value)s',
+ event=event, key=key, value=value_msg, chatty=True)
for key in current_env.keys():
if key not in previous_env: