Merge lp:~brian-murray/launchpad/bug-130902 into lp:launchpad

[Brian Murray]

Add in a X-Launchpad-Bug-Reporter header to bug mail that identifies the original reporter of a bug report to aid email filtering.

This branch adds in a X-Launchpad-Bug-Reporter header to bug mail that identifies the original reporter of a bug report to aid email filtering.

Tests modified:

bin/test -cvvt bugnotification-email -t bugnotification-sending

[Edwin Grubbs (edwin-grubbs)]

Looks good.

review: Approve

=== modified file 'lib/canonical/launchpad/mailnotification.py'
--- lib/canonical/launchpad/mailnotification.py	2010-06-23 01:15:11 +0000
+++ lib/canonical/launchpad/mailnotification.py	2010-06-23 18:39:24 +0000
@@ -116,6 +116,12 @@
         self.common_headers.append(
             ('X-Launchpad-Bug-Commenters', ' '.join(sorted(commenters))))
 
+        # Add the -Bug-Reporter header to identify the owner of the bug
+        # and the original bug task for filtering
+        self.common_headers.append(
+            ('X-Launchpad-Bug-Reporter',
+             '%s (%s)' % ( bug.owner.displayname, bug.owner.name )))
+
     def build(self, from_address, to_address, body, subject, email_date,
               rationale=None, references=None, message_id=None):
         """Construct the notification.

=== modified file 'lib/lp/bugs/doc/bugnotification-email.txt'
--- lib/lp/bugs/doc/bugnotification-email.txt	2010-06-22 17:08:23 +0000
+++ lib/lp/bugs/doc/bugnotification-email.txt	2010-06-23 18:39:24 +0000
@@ -505,6 +505,7 @@
     X-Launchpad-Bug-Private: yes
     X-Launchpad-Bug-Security-Vulnerability: yes
     X-Launchpad-Bug-Commenters: name12
+    X-Launchpad-Bug-Reporter: Sample Person (name12)
 
 The build() method of a builder accepts a number of parameters and
 returns an instance of email.MIMEText. The most basic invocation of

=== modified file 'lib/lp/bugs/doc/bugnotification-sending.txt'
--- lib/lp/bugs/doc/bugnotification-sending.txt	2010-06-22 17:08:23 +0000
+++ lib/lp/bugs/doc/bugnotification-sending.txt	2010-06-23 18:39:24 +0000
@@ -1187,6 +1187,16 @@
     name12 name16
 
 
+== The X-Launchpad-Bug-Reporter header ==
+
+The X-Launchpad-Bug-Reporter header contains information about the Launchpad
+user who originally reported the bug and opened the bug's first bug task.
+
+    >>> for message in trigger_and_get_email_messages(bug_three):
+    ...     print message.get('X-Launchpad-Bug-Reporter')
+    Foo Bar (name16)
+
+
 == Verbose bug notifications ==
 
 It is possible for users to have all the bug notifications which they