messages: Try to group emails together

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/templates/builds/messages/comment.txt b/src/templates/builds/messages/comment.txt
index bedc65eba02430250fadc2639bf248ad0302cd6a..735054c26ef664b33cdfbe87fad5f6fa4fa1fe3e 100644 (file)
--- a/src/templates/builds/messages/comment.txt
+++ b/src/templates/builds/messages/comment.txt
@@ -1,4 +1,5 @@
 To: {{ recipient.email_to }}
 Subject: {{ _("%(user)s commented on %(build)s") % { "user" : comment.user, "build" : build }}
+References: <build-{{ build.uuid }}-finished@pakfire.ipfire.org> <build-{{ build.uuid }}-failed@pakfire.ipfire.org>
 
 {% for line in comment.text.splitlines() %}  {{ line }}{% end %}

diff --git a/src/templates/builds/messages/failed.txt b/src/templates/builds/messages/failed.txt
index 961dcae6439c25622a9110f76ea4b40d09f9d393..a889fae29608e6ffad6065430ed3be5c4f7ef324 100644 (file)
--- a/src/templates/builds/messages/failed.txt
+++ b/src/templates/builds/messages/failed.txt
@@ -1,5 +1,6 @@
 To: {{ recipient.email_to }}
 Subject: [{{ build }}] {{ _("Build Failed") }}
+Message-Id: <build-{{ build.uuid }}-failed@pakfire.ipfire.org>
 
 {{ _("Hello %s,") % recipient }}
 

diff --git a/src/templates/builds/messages/finished.txt b/src/templates/builds/messages/finished.txt
index c92a612ef72e8a195972047f6ca4706c4a45ff18..932e4c644989083d2b8b5345fa36be91a513e100 100644 (file)
--- a/src/templates/builds/messages/finished.txt
+++ b/src/templates/builds/messages/finished.txt
@@ -1,4 +1,5 @@
 To: {{ recipient.email_to }}
 Subject: [{{ build }}] {{ _("Build Finished") }}
+Message-Id: <build-{{ build.uuid }}-finished@pakfire.ipfire.org>
 
 XXX TODO

diff --git a/src/templates/jobs/messages/failed.txt b/src/templates/jobs/messages/failed.txt
index ad6f45b726809da4fac0e0081fddf4ff7563954b..c817707535ac8bd928490251822e918dd286a9cb 100644 (file)
--- a/src/templates/jobs/messages/failed.txt
+++ b/src/templates/jobs/messages/failed.txt
@@ -1,5 +1,8 @@
 To: {{ recipient.email_to }}
 Subject: [{{ job.name }}] {{ _("Build Job Failed") }}
+Message-Id: <job-{{ job.uuid }}-failed@pakfire.ipfire.org>
+In-Reply-To: <build-{{ job.build.uuid }}-failed@pakfire.ipfire.org>
+References: <build-{{ job.build.uuid }}-failed@pakfire.ipfire.org>
 
 {{ _("Hello %s,") % recipient }}