← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~cjwatson/launchpad/snap-personmerge-whitelist into lp:launchpad

 

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

Commit message:
Temporarily whitelist snap.owner from personmerge.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

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

Temporarily whitelist snap.owner from personmerge.  This will need to be deployed before https://code.launchpad.net/~cjwatson/launchpad/db-snappy/+merge/265332 can be landed.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~cjwatson/launchpad/snap-personmerge-whitelist into lp:launchpad.
=== modified file 'lib/lp/registry/personmerge.py'
--- lib/lp/registry/personmerge.py	2015-04-19 12:56:32 +0000
+++ lib/lp/registry/personmerge.py	2015-07-23 13:09:33 +0000
@@ -713,6 +713,9 @@
         ('latestpersonsourcepackagereleasecache', 'maintainer'),
         # Obsolete table.
         ('branchmergequeue', 'owner'),
+        # This needs handling before we deploy the snap code, but can be
+        # ignored for the purpose of deploying the database tables.
+        ('snap', 'owner'),
         ]
 
     references = list(postgresql.listReferences(cur, 'person', 'id'))


Follow ups