launchpad-reviewers team mailing list archive

[Steve Kowalik <stevenk@xxxxxxxxxx>]

Steve Kowalik has proposed merging lp:~stevenk/launchpad/tilde-archivesubscriptions into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~stevenk/launchpad/tilde-archivesubscriptions/+merge/66573

Change the P3A subscription mail to use ~/+archivesubscriptions rather than calculating the canonical URL for person.
-- 
https://code.launchpad.net/~stevenk/launchpad/tilde-archivesubscriptions/+merge/66573
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~stevenk/launchpad/tilde-archivesubscriptions into lp:launchpad.

=== modified file 'lib/canonical/launchpad/mailnotification.py'
--- lib/canonical/launchpad/mailnotification.py	2011-06-07 20:16:27 +0000
+++ lib/canonical/launchpad/mailnotification.py	2011-07-01 09:58:27 +0000
@@ -14,6 +14,7 @@
 from email.MIMEMultipart import MIMEMultipart
 from email.MIMEText import MIMEText
 import re
+from zope.component import getUtility
 
 from canonical.config import config
 from canonical.database.sqlbase import block_implicit_flushes
@@ -27,6 +28,7 @@
     simple_sendmail,
     simple_sendmail_from_person,
     )
+from canonical.launchpad.webapp.interfaces import ILaunchpadRoot
 from canonical.launchpad.webapp.publisher import canonical_url
 from lp.blueprints.interfaces.specification import ISpecification
 from lp.bugs.mail.bugnotificationbuilder import get_bugmail_error_address
@@ -290,8 +292,9 @@
             continue
 
         to_address = [person.preferredemail.email]
-        recipient_subscriptions_url = "%s/+archivesubscriptions" % (
-            canonical_url(person))
+        root = getUtility(ILaunchpadRoot)
+        recipient_subscriptions_url = "%s~/+archivesubscriptions" % (
+            canonical_url(root))
         description_blurb = '.'
         if ppa_description is not None and ppa_description != '':
             description_blurb = (

=== modified file 'lib/lp/soyuz/doc/archivesubscriber.txt'
--- lib/lp/soyuz/doc/archivesubscriber.txt	2010-12-17 06:04:39 +0000
+++ lib/lp/soyuz/doc/archivesubscriber.txt	2011-07-01 09:58:27 +0000
@@ -131,7 +131,7 @@
     To start downloading and using software from this archive you need to
     view your access details by visiting this link:
     <BLANKLINE>
-    <http://launchpad.dev/~joesmith/+archivesubscriptions>
+    <http://launchpad.dev/~/+archivesubscriptions>
     <BLANKLINE>
     You can find out more about Celso Providelo here:
     <BLANKLINE>
@@ -167,7 +167,7 @@
     To start downloading and using software from this archive you need to
     view your access details by visiting this link:
     <BLANKLINE>
-    <http://launchpad.dev/~fredsmith/+archivesubscriptions>
+    <http://launchpad.dev/~/+archivesubscriptions>
     <BLANKLINE>
     You can find out more about Celso Providelo here:
     <BLANKLINE>