Merge lp:~abentley/launchpad/mark-dup-empty into lp:launchpad
Status: | Merged |
---|---|
Merged at revision: | 13557 |
Proposed branch: | lp:~abentley/launchpad/mark-dup-empty |
Merge into: | lp:launchpad |
Diff against target: |
42 lines (+13/-1) 2 files modified
lib/lp/bugs/model/bug.py (+2/-1) lib/lp/bugs/model/tests/test_bug.py (+11/-0) |
To merge this branch: | bzr merge lp:~abentley/launchpad/mark-dup-empty |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
j.c.sackett (community) | Approve | ||
Review via email: mp+69704@code.launchpad.net |
Commit message
No AttributeError marking a bug as not a dupe.
Description of the change
= Summary =
Fix bug #811262: AttributeError: 'NoneType' object has no attribute 'updateHeat'
== Proposed fix ==
Do not assume that the current duplicate is non-None if markAsDuplicate is called with None.
== Pre-implementation notes ==
None
== Implementation details ==
The code assumed the bug must be a duplicate if markAsDuplicate
== Tests ==
bin/test test_bug -t markAsD
== Demo and Q/A ==
Go to a bug's mark-as-duplicate page for a bug that is not alredy marked as a duplicate. Don't enter a value, and hit 'Change'. You should not get an oops.
= Launchpad lint =
Checking for conflicts and issues in changed files.
Linting changed files:
lib/lp/
lib/lp/
Good fix.