← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] ~jugmac00/launchpad:remove-no-longer-needed-code into launchpad:master

 

Jürgen Gmach has proposed merging ~jugmac00/launchpad:remove-no-longer-needed-code into launchpad:master.

Commit message:
Remove obsolete code

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~jugmac00/launchpad/+git/launchpad/+merge/473462

rock recipe's are handled properly for person merges since
a6561c7d32b17d1401cce62c180d5042f1a58a33 but it was missed to remove
that chunk of code.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~jugmac00/launchpad:remove-no-longer-needed-code into launchpad:master.
diff --git a/lib/lp/registry/personmerge.py b/lib/lp/registry/personmerge.py
index b16cea2..0f535c3 100644
--- a/lib/lp/registry/personmerge.py
+++ b/lib/lp/registry/personmerge.py
@@ -1061,12 +1061,6 @@ def merge_people(from_person, to_person, reviewer, delete=False):
         ("latestpersonsourcepackagereleasecache", "maintainer"),
         # Obsolete table.
         ("branchmergequeue", "owner"),
-        # XXX jugmac00 2024-08-26: This needs handling before we deploy the
-        # rock recipe code, but can be ignored for the purpose of deploying
-        # the database tables.
-        # see commit a98e2a935646ff7496c76c607d355815027c35a4 for similar
-        # required changes in the past for the charm build type.
-        ("rockrecipe", "owner"),
     ]
 
     references = list(postgresql.listReferences(cur, "person", "id"))