email output: Add MIME headers

We universally use UTF-8 in git commit messages and other kinds of
messages.  The RFC-*822 default is us-ascii.  Fix this by providing a
set of MIME headers.

Reported-by: Andrew Cooper <andrew.cooper3@citrix.com>
Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>

diff --git a/Osstest.pm b/Osstest.pm
index ceb62ca50bc40be5925997edb64a3db8c20d3c80..226378697327a57cf7b0f05f8bc12a60cc791d79 100644 (file)
--- a/Osstest.pm
+++ b/Osstest.pm
@@ -246,6 +246,12 @@ sub readglobalconfig () {
 
     $c{DebianMirrorHost} ||= 'ftp.debian.org' if $c{DebianMirrorProxy};
 
+    $c{EmailStdHeaders} ||= <<'END';
+Content-Type: text/plain; charset="UTF-8"
+Content-Transfer-Encoding: 8bit
+MIME-Version: 1.0
+END
+
     my $pubbaseprefix = $c{PubBaseDir} ? "$c{PubBaseDir}/" : "";
     foreach my $l (qw(logs results)) {
        my $u = ucfirst $l;

diff --git a/cri-args-hostlists b/cri-args-hostlists
index 58a22522d79c8720be2ec839c67eb1ba6d97f9a7..a75ff7bfb930766f6016f2a5ad0a7106e282ad21 100644 (file)
--- a/cri-args-hostlists
+++ b/cri-args-hostlists
@@ -103,6 +103,7 @@ start_email () {
                cat $OSSTEST_EMAIL_HEADER
        fi
        echo "Message-ID: <osstest-$flight-mainreport@xen.org>"
+       printf '%s\n' "`getconfig EmailStdHeaders`"
        printf 'Subject: %s' "${subject_prefix:-[$branch test] }"
 
        local flight_html_dir=$OSSTEST_HTMLPUB_DIR/

diff --git a/mg-execute-flight b/mg-execute-flight
index 5a861b05c4a92e605061ea0a00287145e2702f0f..98aca45d30b2f809fef87a98f23879faeec92507 100755 (executable)
--- a/mg-execute-flight
+++ b/mg-execute-flight
@@ -58,6 +58,7 @@ if [ x"$flight" = x ]; then badusage; fi
 
 : ${blessing:=play}
 : ${email:=`getconfig Username`}
+: ${email_std_headers:=`getconfig EmailStdHeaders`}
 
 set +e
 tty=`exec 2>/dev/null; tty`
@@ -88,6 +89,7 @@ exec >tmp/$flight.email
 cat <<END
 To: $email
 Subject: [adhoc test] $subject
+$email_std_headers
 
 $OSSTEST_RESOURCE_PREINFO
 END