launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

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

Commit message:
Temporarily whitelist livefs.owner from personmerge.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/livefs-personmerge-whitelist/+merge/223537

Temporarily whitelist livefs.owner from personmerge.  Works around buildbot failure until we can put proper merging code in place.
-- 
https://code.launchpad.net/~cjwatson/launchpad/livefs-personmerge-whitelist/+merge/223537
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~cjwatson/launchpad/livefs-personmerge-whitelist into lp:launchpad.

=== modified file 'lib/lp/registry/personmerge.py'
--- lib/lp/registry/personmerge.py	2014-01-15 18:09:00 +0000
+++ lib/lp/registry/personmerge.py	2014-06-18 10:57:10 +0000
@@ -672,6 +672,9 @@
         ('bugsummaryjournal', 'viewed_by'),
         ('latestpersonsourcepackagereleasecache', 'creator'),
         ('latestpersonsourcepackagereleasecache', 'maintainer'),
+        # This needs handling before we deploy the livefs code, but can be
+        # ignored for the purpose of deploying the database tables.
+        ('livefs', 'owner'),
         ]
 
     references = list(postgresql.listReferences(cur, 'person', 'id'))