launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging lp:~cjwatson/launchpad/git-subscriptions-personmerge-whitelist into lp:launchpad.

Commit message:
Temporarily whitelist gitsubscription.person from personmerge.

Requested reviews:
  Colin Watson (cjwatson)
Related bugs:
  Bug #1444591 in Launchpad itself: "Allow Git repository subscriptions"
  https://bugs.launchpad.net/launchpad/+bug/1444591

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/git-subscriptions-personmerge-whitelist/+merge/256515

Temporarily whitelist gitsubscription.person from personmerge.
-- 
Your team Launchpad code reviewers is subscribed to branch lp:launchpad.

=== modified file 'lib/lp/registry/personmerge.py'
--- lib/lp/registry/personmerge.py	2015-02-23 19:47:01 +0000
+++ lib/lp/registry/personmerge.py	2015-04-16 15:07:18 +0000
@@ -699,6 +699,9 @@
         ('bugsummaryjournal', 'viewed_by'),
         ('latestpersonsourcepackagereleasecache', 'creator'),
         ('latestpersonsourcepackagereleasecache', 'maintainer'),
+        # This needs handling before we deploy Git subscriptions, but can be
+        # ignored for the purpose of deploying the database tables.
+        ('gitsubscription', 'person'),
         ]
 
     references = list(postgresql.listReferences(cur, 'person', 'id'))