Merge lp:~stevenk/launchpad/p3a-description-fix into lp:launchpad

[Steve Kowalik]

[r=henninge][ui=none][bug=691018] Correct white-space in the P3A new subscription e-mail.

This branch corrects issue with the change introduced in https://code.launchpad.net/~stevenk/launchpad/p3a-email-description-cleanup/+merge/43882

I have fixed the issue, as well as fixed the tests to trip over the error.

[Henning Eggers (henninge)]

Looks good, thanks. ;-)

review: Approve (code)

=== modified file 'lib/canonical/launchpad/mailnotification.py'
--- lib/canonical/launchpad/mailnotification.py	2010-12-16 11:36:06 +0000
+++ lib/canonical/launchpad/mailnotification.py	2010-12-17 06:10:53 +0000
@@ -564,8 +564,8 @@
             canonical_url(person))
         description_blurb = '.'
         if ppa_description is not None and ppa_description != '':
-            description_blurb = ' and has the following description:\n%s' % (
-                ppa_description)
+            description_blurb = (
+                ' and has the following description:\n\n%s' % ppa_description)
         replacements = {
             'recipient_name': person.displayname,
             'registrant_name': registrant_name,

=== modified file 'lib/lp/soyuz/doc/archivesubscriber.txt'
--- lib/lp/soyuz/doc/archivesubscriber.txt	2010-12-16 11:07:24 +0000
+++ lib/lp/soyuz/doc/archivesubscriber.txt	2010-12-17 06:10:53 +0000
@@ -112,7 +112,7 @@
 An email is sent to the subscribed person when the ArchiveSubscriber
 entry is created:
 
-    >>> print_emails(include_reply_to=True)
+    >>> print_emails(include_reply_to=True) #doctest: -NORMALIZE_WHITESPACE
     From: Celso Providelo <[e-mail]>
     To: [e-mail]
     Reply-To: Celso Providelo <[e-mail]>
@@ -123,8 +123,8 @@
     --------------------------------------
     <BLANKLINE>
     Celso Providelo has granted you access to a private software archive
-    "PPA named p3a for Celso Providelo" (ppa:cprov/p3a), which is hosted
-    by Launchpad and has the following description:
+    "PPA named p3a for Celso Providelo" (ppa:cprov/p3a), which is hosted by
+    Launchpad and has the following description:
     <BLANKLINE>
     packages to help my friends.
     <BLANKLINE>
@@ -141,7 +141,6 @@
     ignore this email. However, if you have any concerns you can contact the
     Launchpad team by emailing [e-mail]
     <BLANKLINE>
-    <BLANKLINE>
     Regards,
     The Launchpad team
     ----------------------------------------
@@ -151,7 +150,7 @@
 
     >>> cprov_private_ppa.description = None
     >>> unused = cprov_private_ppa.newSubscription(fredsmith, cprov)
-    >>> print_emails(include_reply_to=True)
+    >>> print_emails(include_reply_to=True) #doctest: -NORMALIZE_WHITESPACE
     From: Celso Providelo <[e-mail]>
     To: [e-mail]
     Reply-To: Celso Providelo <[e-mail]>
@@ -162,8 +161,8 @@
     --------------------------------------
     <BLANKLINE>
     Celso Providelo has granted you access to a private software archive
-    "PPA named p3a for Celso Providelo" (ppa:cprov/p3a), which is hosted
-    by Launchpad.
+    "PPA named p3a for Celso Providelo" (ppa:cprov/p3a), which is hosted by
+    Launchpad.
     <BLANKLINE>
     To start downloading and using software from this archive you need to
     view your access details by visiting this link: