Merge lp:~stevenk/launchpad/kill-malone.bugmessage_owner into lp:launchpad

Proposed by Steve Kowalik
Status: Merged
Approved by: Steve Kowalik
Approved revision: no longer in the source branch.
Merged at revision: 13905
Proposed branch: lp:~stevenk/launchpad/kill-malone.bugmessage_owner
Merge into: lp:launchpad
Diff against target: 30 lines (+1/-16)
1 file modified
lib/lp/bugs/model/bugtask.py (+1/-16)
To merge this branch: bzr merge lp:~stevenk/launchpad/kill-malone.bugmessage_owner
Reviewer Review Type Date Requested Status
Henning Eggers (community) Approve
Review via email: mp+74775@code.launchpad.net

Commit message

[r=henninge][bug=814804] Drop the malone.bugmessage_owner feature flag.

Description of the change

The malone.bugmessage_owner feature flag is undocumented and enabled for everyone, so let's remove it.

To post a comment you must log in.
Henning Eggers (henninge) wrote :

Great, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/bugs/model/bugtask.py'
2--- lib/lp/bugs/model/bugtask.py 2011-09-07 15:40:13 +0000
3+++ lib/lp/bugs/model/bugtask.py 2011-09-09 13:15:16 +0000
4@@ -2079,25 +2079,10 @@
5 extra_clauses.append(bug_reporter_clause)
6
7 if params.bug_commenter:
8- bugmessage_owner = bool(features.getFeatureFlag(
9- 'malone.bugmessage_owner'))
10- bug_commenter_old_clause = """
11- BugTask.id IN (
12- SELECT DISTINCT BugTask.id FROM BugTask, BugMessage, Message
13- WHERE Message.owner = %(bug_commenter)s
14- AND Message.id = BugMessage.message
15- AND BugTask.bug = BugMessage.bug
16- AND BugMessage.index > 0
17- )
18- """ % sqlvalues(bug_commenter=params.bug_commenter)
19- bug_commenter_new_clause = """
20+ bug_commenter_clause = """
21 Bug.id IN (SELECT DISTINCT bug FROM Bugmessage WHERE
22 BugMessage.index > 0 AND BugMessage.owner = %(bug_commenter)s)
23 """ % sqlvalues(bug_commenter=params.bug_commenter)
24- if bugmessage_owner:
25- bug_commenter_clause = bug_commenter_new_clause
26- else:
27- bug_commenter_clause = bug_commenter_old_clause
28 extra_clauses.append(bug_commenter_clause)
29
30 if params.affects_me: