Merge lp:~cjwatson/launchpad/mp-job-new-revision-author into lp:launchpad

[Colin Watson]

Fix crash when scanning a Git-based MP when we need to link a new RevisionAuthor to an existing Person.

[William Grant (wgrant)]

review: Approve (code)

=== modified file 'database/schema/security.cfg'
--- database/schema/security.cfg	2017-05-19 15:52:35 +0000
+++ database/schema/security.cfg	2017-05-25 17:35:24 +0000
@@ -2009,7 +2009,7 @@
 public.productseries                    = SELECT
 public.project                          = SELECT
 public.revision                         = SELECT
-public.revisionauthor                   = SELECT, INSERT
+public.revisionauthor                   = SELECT, INSERT, UPDATE
 public.seriessourcepackagebranch        = SELECT
 public.sourcepackagename                = SELECT
 public.structuralsubscription           = SELECT

=== modified file 'lib/lp/code/model/tests/test_branchmergeproposaljobs.py'
--- lib/lp/code/model/tests/test_branchmergeproposaljobs.py	2017-05-19 15:52:35 +0000
+++ lib/lp/code/model/tests/test_branchmergeproposaljobs.py	2017-05-25 17:35:24 +0000
@@ -272,10 +272,15 @@
         subscriber = self.factory.makePerson()
         bug.default_bugtask.target.addSubscription(subscriber, subscriber)
         bmp, _, _, patch = self.createExampleGitMerge()
+        committer = self.factory.makePerson()
         self.hosting_fixture.getLog.result = [
             {
                 u"sha1": unicode(hashlib.sha1("tip").hexdigest()),
                 u"message": u"Fix upside-down messages\n\nLP: #%d" % bug.id,
+                u"committer": {
+                    u"name": committer.display_name,
+                    u"email": committer.preferredemail.email,
+                    },
                 },
             ]
         job = UpdatePreviewDiffJob.create(bmp)