Move pre-merge person rules into the model.
Bug #741094 reported by
Curtis Hovey
This bug affects 1 person
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| Launchpad itself |
Fix Released
|
Critical
|
Unassigned | ||
Bug Description
Before bug 736421 can be fixed, the pre-merge work that can timeout needs to be moved into the model so that PersonMergeJob can put the person or team in a sane state for merging.
Related branches
lp://qastaging/~sinzui/launchpad/person-merge-job-2
- Brad Crittenden (community): Approve (code)
-
Diff: 777 lines (+149/-307)14 files modifiedlib/canonical/launchpad/database/emailaddress.py (+4/-1)
lib/lp/registry/browser/peoplemerge.py (+14/-85)
lib/lp/registry/browser/tests/peoplemerge-views.txt (+1/-18)
lib/lp/registry/browser/tests/test_peoplemerge.py (+0/-52)
lib/lp/registry/doc/mailinglists.txt (+1/-1)
lib/lp/registry/doc/person-merge.txt (+0/-88)
lib/lp/registry/doc/teammembership.txt (+1/-1)
lib/lp/registry/doc/vocabularies.txt (+5/-7)
lib/lp/registry/interfaces/persontransferjob.py (+9/-4)
lib/lp/registry/model/mailinglist.py (+3/-0)
lib/lp/registry/model/person.py (+50/-28)
lib/lp/registry/model/persontransferjob.py (+16/-3)
lib/lp/registry/tests/test_person.py (+42/-18)
lib/lp/registry/tests/test_person_merge_job.py (+3/-1)
Revision history for this message
| Launchpad QA Bot (lpqabot) wrote | #1 |
| Changed in launchpad: | |
| milestone: | none → 11.04 |
| tags: | added: qa-needstesting |
| Changed in launchpad: | |
| status: | In Progress → Fix Committed |
Revision history for this message
| Curtis Hovey (sinzui) wrote | #2 |
| tags: |
added: qa-ok removed: qa-needstesting |
| Changed in launchpad: | |
| status: | Fix Committed → Fix Released |
| Changed in launchpad: | |
| assignee: | Curtis Hovey (sinzui) → nobody |
To post a comment you must log in.
Fixed in stable r12665 <http://