Merge lp:~jelmer/launchpad/bug589073 into lp:launchpad/db-devel

[Jelmer Vernooij]

Allow archiveuploader to update the emailaddress table.

In rare occassions it may be necessary for the uploader to update an existing emailaddress entry to link it to a person. This is what happened in bug 589073.

This branch gives the archive uploader the permission to update emailaddress entries and updates nascentfileupload.txt to reproduce this situation.

[Jeroen T. Vermeulen (jtv)]

Looks good. Just one note: you'll usually want to use

    >>> print value
    foo

rather than...

    >>> print value
    'foo'

...which can break unnecessarily if the value comes out as u'foo' etc.

review: Approve (code)

[Jelmer Vernooij (jelmer)]

I assume you mean without the "print" on the first line, I've fixed my branch accordingly.

Thanks for the review.

=== modified file 'database/schema/security.cfg'
--- database/schema/security.cfg	2010-06-13 11:02:30 +0000
+++ database/schema/security.cfg	2010-06-16 09:10:57 +0000
@@ -1056,7 +1056,7 @@
 public.account                          = SELECT, INSERT
 public.accountpassword                  = SELECT, INSERT
 public.person                           = SELECT, INSERT, UPDATE
-public.emailaddress                     = SELECT, INSERT
+public.emailaddress                     = SELECT, INSERT, UPDATE
 public.teamparticipation                = SELECT, INSERT
 public.teammembership                   = SELECT
 public.wikiname                         = SELECT, INSERT
 
=== modified file 'lib/lp/archiveuploader/tests/nascentuploadfile.txt'
--- lib/lp/archiveuploader/tests/nascentuploadfile.txt	2010-04-20 21:20:43 +0000
+++ lib/lp/archiveuploader/tests/nascentuploadfile.txt	2010-06-16 09:10:57 +0000
@@ -409,6 +409,37 @@
     >>> addr['person'].creation_comment
     u'when the some-source_6.6.6 package was uploaded to hoary/RELEASE'
 
+If the email address is registered but not associated with a person it will be 
+associated with a new Person. This involves updating the email address, something 
+for which the uploader must have explicit permissions (bug 589073).
+
+    >>> sig_file.policy.create_people
+    True
+
+    >>> from canonical.database.sqlbase import commit
+    >>> from canonical.launchpad.interfaces.account import IAccountSet
+    >>> from lp.registry.interfaces.person import (
+    ...      PersonCreationRationale, IPersonSet)
+    >>> (acct, email) = getUtility(IAccountSet).createAccountAndEmail(
+    ...          "[e-mail]", PersonCreationRationale.UNKNOWN,
+    ...          "fo", "secr1t")
+    >>> person = getUtility(IPersonSet).createPersonWithoutEmail("fo",
+    ...          rationale=PersonCreationRationale.UNKNOWN)
+	>>> person.account = acct
+
+    Commit the changes so the emailaddress will have to be updated later 
+    rather than inserted.
+
+    >>> commit()
+
+    >>> addr = sig_file.parseAddress("Foo <[e-mail]>")
+    >>> print addr['person'].creation_rationale.name
+    UNKNOWN
+    >>> commit()
+
+    >>> print addr['email']
+    [e-mail]
+
 If the use an un-initialised policy to create a launchpad person the
 creation_rationale will still be possible, however missing important
 information, the upload target:
@@ -765,7 +796,7 @@
    ...                     mock_logger_quiet)
    >>> list(ed_binary_deb.verifyDebTimestamp())
    [UploadError('ed_0.2-20_i386.deb: has 26 file(s) with a time stamp too 
-    	far into the future (e.g. control [Thu Jan  3 19:29:01 2008]).',)]
+        far into the future (e.g. control [Thu Jan  3 19:29:01 2008]).',)]
 
 ... as well as for being too old: