summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChuck Short <chuck.short@canonical.com>2013-02-10 16:45:07 -0600
committerChuck Short <chuck.short@canonical.com>2013-02-10 16:46:07 -0600
commitfffcaea176b785c9715a180f6a629708db16536c (patch)
tree7e9fbd5fef54ffc9ef4404411500a88a462a29e9
parentdc49288ac03a56e23c3634238d0da099cea351b6 (diff)
downloadnova-fffcaea176b785c9715a180f6a629708db16536c.tar.gz
nova-fffcaea176b785c9715a180f6a629708db16536c.tar.xz
nova-fffcaea176b785c9715a180f6a629708db16536c.zip
Add control-M to list of characters to strip out
Adds ^M to list of characters to strip out. Fixes LP: #1108820 Change-Id: I070fa566afaafdb932a21b198c669628c56b284b Signed-off-by: Chuck Short <chuck.short@canonical.com>
-rw-r--r--nova/api/openstack/compute/contrib/console_output.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/api/openstack/compute/contrib/console_output.py b/nova/api/openstack/compute/contrib/console_output.py
index 953459d38..4f01bbaf4 100644
--- a/nova/api/openstack/compute/contrib/console_output.py
+++ b/nova/api/openstack/compute/contrib/console_output.py
@@ -67,7 +67,7 @@ class ConsoleOutputController(wsgi.Controller):
raise webob.exc.HTTPNotFound(_('Unable to get console'))
# XML output is not correctly escaped, so remove invalid characters
- remove_re = re.compile('[\x00-\x08\x0B-\x0C\x0E-\x1F]')
+ remove_re = re.compile('[\x00-\x08\x0B-\x0C\x0E-\x1F-\x0D]')
output = remove_re.sub('', output)
return {'output': output}