Commit 600f28a6 authored by Sascha Markus's avatar Sascha Markus Committed by intrigeri
Browse files

Ensure debugging info in Whisperback reports don't contain email signature...

Ensure debugging info in Whisperback reports don't contain email signature markers (Fix-committed: #15468)

… otherwise email clients tend to drop all the text after the first
such marker when replying to, or forwarding, such a report.
parent 9c1c66e9
......@@ -12,6 +12,7 @@
import os
import subprocess
import random
import re
import locale
import gettext
......@@ -173,7 +174,7 @@ def mail_appended_info():
process = subprocess.Popen (["sudo", "/usr/local/sbin/tails-debugging-info"],
stdout=subprocess.PIPE)
for line in process.stdout:
debugging_info += line.decode('utf-8')
debugging_info += re.sub(r'^--\s*', '', line.decode('utf-8'))
process.wait()
except OSError:
debugging_info += "sudo command not found\n"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment