Merge lp:~gmb/launchpad/bug-276723 into lp:launchpad
- bug-276723
- Merge into devel
Proposed by
Graham Binns
| Status: | Merged |
|---|---|
| Approved by: | Graham Binns |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 11990 |
| Proposed branch: | lp:~gmb/launchpad/bug-276723 |
| Merge into: | lp:launchpad |
| Diff against target: |
510 lines (+106/-79) 4 files modified
lib/canonical/launchpad/emailtemplates/bug-notification-verbose.txt (+5/-3) lib/canonical/launchpad/emailtemplates/bug-notification.txt (+4/-2) lib/lp/bugs/doc/bugnotification-sending.txt (+96/-68) lib/lp/bugs/scripts/bugnotification.py (+1/-6) |
| To merge this branch: | bzr merge lp:~gmb/launchpad/bug-276723 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Abel Deuring (community) | code | Approve | |
|
Review via email:
|
|||
Commit message
[r=adeuring]
Description of the change
This branch fixes bug 276723 by altering the formatting of the bugmail
footer. The code changes are very slight but there are a lot of doctest
changes, since the exact formatting has to be corrected over and over
and over again.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
| 1 | === modified file 'lib/canonical/launchpad/emailtemplates/bug-notification-verbose.txt' | |||
| 2 | --- lib/canonical/launchpad/emailtemplates/bug-notification-verbose.txt 2009-11-17 17:33:28 +0000 | |||
| 3 | +++ lib/canonical/launchpad/emailtemplates/bug-notification-verbose.txt 2010-11-26 14:08:20 +0000 | |||
| 4 | @@ -1,13 +1,15 @@ | |||
| 5 | 1 | %(content)s | 1 | %(content)s |
| 6 | 2 | 2 | ||
| 7 | 3 | -- | 3 | -- |
| 9 | 4 | %(bug_title)s | 4 | %(notification_rationale)s |
| 10 | 5 | %(bug_url)s | 5 | %(bug_url)s |
| 12 | 6 | %(notification_rationale)s | 6 | |
| 13 | 7 | Title: | ||
| 14 | 8 | %(bug_title)s | ||
| 15 | 7 | 9 | ||
| 16 | 8 | %(bug_statuses)s | 10 | %(bug_statuses)s |
| 17 | 9 | 11 | ||
| 18 | 10 | Bug description: | 12 | Bug description: |
| 20 | 11 | %(bug_description)s | 13 | %(bug_description)s |
| 21 | 12 | 14 | ||
| 22 | 13 | %(unsubscribe_notice)s | 15 | %(unsubscribe_notice)s |
| 23 | 14 | 16 | ||
| 24 | === modified file 'lib/canonical/launchpad/emailtemplates/bug-notification.txt' | |||
| 25 | --- lib/canonical/launchpad/emailtemplates/bug-notification.txt 2007-03-15 22:11:44 +0000 | |||
| 26 | +++ lib/canonical/launchpad/emailtemplates/bug-notification.txt 2010-11-26 14:08:20 +0000 | |||
| 27 | @@ -1,6 +1,8 @@ | |||
| 28 | 1 | %(content)s | 1 | %(content)s |
| 29 | 2 | 2 | ||
| 30 | 3 | -- | 3 | -- |
| 32 | 4 | %(bug_title)s | 4 | %(notification_rationale)s |
| 33 | 5 | %(bug_url)s | 5 | %(bug_url)s |
| 35 | 6 | %(notification_rationale)s | 6 | |
| 36 | 7 | Title: | ||
| 37 | 8 | %(bug_title)s | ||
| 38 | 7 | 9 | ||
| 39 | === modified file 'lib/lp/bugs/doc/bugnotification-sending.txt' | |||
| 40 | --- lib/lp/bugs/doc/bugnotification-sending.txt 2010-10-18 22:24:59 +0000 | |||
| 41 | +++ lib/lp/bugs/doc/bugnotification-sending.txt 2010-11-26 14:08:20 +0000 | |||
| 42 | @@ -85,10 +85,12 @@ | |||
| 43 | 85 | a comment. | 85 | a comment. |
| 44 | 86 | <BLANKLINE> | 86 | <BLANKLINE> |
| 45 | 87 | ... | 87 | ... |
| 46 | 88 | Firefox does not support SVG | ||
| 47 | 89 | http://bugs.launchpad.dev/bugs/1 | ||
| 48 | 90 | You received this bug notification because you are subscribed to | 88 | You received this bug notification because you are subscribed to |
| 49 | 91 | mozilla-firefox in ubuntu. | 89 | mozilla-firefox in ubuntu. |
| 50 | 90 | http://bugs.launchpad.dev/bugs/1 | ||
| 51 | 91 | <BLANKLINE> | ||
| 52 | 92 | Title: | ||
| 53 | 93 | Firefox does not support SVG | ||
| 54 | 92 | <BLANKLINE> | 94 | <BLANKLINE> |
| 55 | 93 | ---------------------------------------------------------------------- | 95 | ---------------------------------------------------------------------- |
| 56 | 94 | To: mark@example.com | 96 | To: mark@example.com |
| 57 | @@ -99,9 +101,11 @@ | |||
| 58 | 99 | a comment. | 101 | a comment. |
| 59 | 100 | <BLANKLINE> | 102 | <BLANKLINE> |
| 60 | 101 | ... | 103 | ... |
| 61 | 102 | Firefox does not support SVG | ||
| 62 | 103 | http://bugs.launchpad.dev/bugs/1 | ||
| 63 | 104 | You received this bug notification because you are a bug assignee. | 104 | You received this bug notification because you are a bug assignee. |
| 64 | 105 | http://bugs.launchpad.dev/bugs/1 | ||
| 65 | 106 | <BLANKLINE> | ||
| 66 | 107 | Title: | ||
| 67 | 108 | Firefox does not support SVG | ||
| 68 | 105 | <BLANKLINE> | 109 | <BLANKLINE> |
| 69 | 106 | ---------------------------------------------------------------------- | 110 | ---------------------------------------------------------------------- |
| 70 | 107 | To: support@ubuntu.com | 111 | To: support@ubuntu.com |
| 71 | @@ -112,10 +116,12 @@ | |||
| 72 | 112 | a comment. | 116 | a comment. |
| 73 | 113 | <BLANKLINE> | 117 | <BLANKLINE> |
| 74 | 114 | -- | 118 | -- |
| 75 | 115 | Firefox does not support SVG | ||
| 76 | 116 | http://bugs.launchpad.dev/bugs/1 | ||
| 77 | 117 | You received this bug notification because you are a member of Ubuntu | 119 | You received this bug notification because you are a member of Ubuntu |
| 78 | 118 | Team, which is the registrant for Ubuntu. | 120 | Team, which is the registrant for Ubuntu. |
| 79 | 121 | http://bugs.launchpad.dev/bugs/1 | ||
| 80 | 122 | <BLANKLINE> | ||
| 81 | 123 | Title: | ||
| 82 | 124 | Firefox does not support SVG | ||
| 83 | 119 | <BLANKLINE> | 125 | <BLANKLINE> |
| 84 | 120 | ---------------------------------------------------------------------- | 126 | ---------------------------------------------------------------------- |
| 85 | 121 | To: test@canonical.com | 127 | To: test@canonical.com |
| 86 | @@ -126,10 +132,12 @@ | |||
| 87 | 126 | a comment. | 132 | a comment. |
| 88 | 127 | <BLANKLINE> | 133 | <BLANKLINE> |
| 89 | 128 | ... | 134 | ... |
| 90 | 129 | Firefox does not support SVG | ||
| 91 | 130 | http://bugs.launchpad.dev/bugs/1 | ||
| 92 | 131 | You received this bug notification because you are a direct subscriber | 135 | You received this bug notification because you are a direct subscriber |
| 93 | 132 | of the bug. | 136 | of the bug. |
| 94 | 137 | http://bugs.launchpad.dev/bugs/1 | ||
| 95 | 138 | <BLANKLINE> | ||
| 96 | 139 | Title: | ||
| 97 | 140 | Firefox does not support SVG | ||
| 98 | 133 | <BLANKLINE> | 141 | <BLANKLINE> |
| 99 | 134 | ---------------------------------------------------------------------- | 142 | ---------------------------------------------------------------------- |
| 100 | 135 | 143 | ||
| 101 | @@ -197,11 +205,12 @@ | |||
| 102 | 197 | a new comment. | 205 | a new comment. |
| 103 | 198 | <BLANKLINE> | 206 | <BLANKLINE> |
| 104 | 199 | -- | 207 | -- |
| 105 | 200 | Firefox does not support SVG | ||
| 106 | 201 | http://bugs.launchpad.dev/bugs/1 | ||
| 107 | 202 | You received this bug notification because you are a member of Ubuntu | 208 | You received this bug notification because you are a member of Ubuntu |
| 108 | 203 | Team, which is the registrant for Ubuntu. | 209 | Team, which is the registrant for Ubuntu. |
| 109 | 210 | http://bugs.launchpad.dev/bugs/1 | ||
| 110 | 204 | <BLANKLINE> | 211 | <BLANKLINE> |
| 111 | 212 | Title: | ||
| 112 | 213 | Firefox does not support SVG | ||
| 113 | 205 | ---------------------------------------------------------------------- | 214 | ---------------------------------------------------------------------- |
| 114 | 206 | To: test@canonical.com | 215 | To: test@canonical.com |
| 115 | 207 | ... | 216 | ... |
| 116 | @@ -239,10 +248,12 @@ | |||
| 117 | 239 | ** Visibility changed to: Private. | 248 | ** Visibility changed to: Private. |
| 118 | 240 | <BLANKLINE> | 249 | <BLANKLINE> |
| 119 | 241 | ... | 250 | ... |
| 120 | 242 | Firefox does not support SVG | ||
| 121 | 243 | http://bugs.launchpad.dev/bugs/1 | ||
| 122 | 244 | You received this bug notification because you are a member of Ubuntu | 251 | You received this bug notification because you are a member of Ubuntu |
| 123 | 245 | Team, which is the registrant for Ubuntu. | 252 | Team, which is the registrant for Ubuntu. |
| 124 | 253 | http://bugs.launchpad.dev/bugs/1 | ||
| 125 | 254 | <BLANKLINE> | ||
| 126 | 255 | Title: | ||
| 127 | 256 | Firefox does not support SVG | ||
| 128 | 246 | <BLANKLINE> | 257 | <BLANKLINE> |
| 129 | 247 | ---------------------------------------------------------------------- | 258 | ---------------------------------------------------------------------- |
| 130 | 248 | To: test@canonical.com | 259 | To: test@canonical.com |
| 131 | @@ -292,11 +303,13 @@ | |||
| 132 | 292 | <BLANKLINE> | 303 | <BLANKLINE> |
| 133 | 293 | ** Visibility changed to: Public. | 304 | ** Visibility changed to: Public. |
| 134 | 294 | <BLANKLINE> | 305 | <BLANKLINE> |
| 138 | 295 | -- | 306 | -- |
| 136 | 296 | Firefox does not support SVG | ||
| 137 | 297 | http://bugs.launchpad.dev/bugs/1 | ||
| 139 | 298 | You received this bug notification because you are a member of Ubuntu | 307 | You received this bug notification because you are a member of Ubuntu |
| 140 | 299 | Team, which is the registrant for Ubuntu. | 308 | Team, which is the registrant for Ubuntu. |
| 141 | 309 | http://bugs.launchpad.dev/bugs/1 | ||
| 142 | 310 | <BLANKLINE> | ||
| 143 | 311 | Title: | ||
| 144 | 312 | Firefox does not support SVG | ||
| 145 | 300 | ---------------------------------------------------------------------- | 313 | ---------------------------------------------------------------------- |
| 146 | 301 | To: test@canonical.com | 314 | To: test@canonical.com |
| 147 | 302 | ... | 315 | ... |
| 148 | @@ -323,10 +336,12 @@ | |||
| 149 | 323 | [..., | 336 | [..., |
| 150 | 324 | '', | 337 | '', |
| 151 | 325 | '-- ', | 338 | '-- ', |
| 153 | 326 | 'Firefox does not support SVG', | 339 | 'You received this bug notification because you are a direct subscriber', |
| 154 | 340 | 'of the bug.', | ||
| 155 | 327 | 'http://bugs.launchpad.dev/bugs/1', | 341 | 'http://bugs.launchpad.dev/bugs/1', |
| 158 | 328 | 'You received this bug notification because you are a direct subscriber', | 342 | '', |
| 159 | 329 | 'of the bug.'] | 343 | 'Title:', |
| 160 | 344 | ' Firefox does not support SVG'] | ||
| 161 | 330 | 345 | ||
| 162 | 331 | >>> flush_notifications() | 346 | >>> flush_notifications() |
| 163 | 332 | 347 | ||
| 164 | @@ -418,10 +433,12 @@ | |||
| 165 | 418 | a comment. | 433 | a comment. |
| 166 | 419 | <BLANKLINE> | 434 | <BLANKLINE> |
| 167 | 420 | -- | 435 | -- |
| 168 | 421 | new bug | ||
| 169 | 422 | http://bugs.launchpad.dev/bugs/16 | ||
| 170 | 423 | You received this bug notification because you are a member of Ubuntu | 436 | You received this bug notification because you are a member of Ubuntu |
| 171 | 424 | Team, which is the registrant for Ubuntu. | 437 | Team, which is the registrant for Ubuntu. |
| 172 | 438 | http://bugs.launchpad.dev/bugs/16 | ||
| 173 | 439 | <BLANKLINE> | ||
| 174 | 440 | Title: | ||
| 175 | 441 | new bug | ||
| 176 | 425 | <BLANKLINE> | 442 | <BLANKLINE> |
| 177 | 426 | ---------------------------------------------------------------------- | 443 | ---------------------------------------------------------------------- |
| 178 | 427 | To: test@canonical.com | 444 | To: test@canonical.com |
| 179 | @@ -435,10 +452,12 @@ | |||
| 180 | 435 | a comment. | 452 | a comment. |
| 181 | 436 | <BLANKLINE> | 453 | <BLANKLINE> |
| 182 | 437 | -- | 454 | -- |
| 183 | 438 | new bug | ||
| 184 | 439 | http://bugs.launchpad.dev/bugs/16 | ||
| 185 | 440 | You received this bug notification because you are a direct subscriber | 455 | You received this bug notification because you are a direct subscriber |
| 186 | 441 | of the bug. | 456 | of the bug. |
| 187 | 457 | http://bugs.launchpad.dev/bugs/16 | ||
| 188 | 458 | <BLANKLINE> | ||
| 189 | 459 | Title: | ||
| 190 | 460 | new bug | ||
| 191 | 442 | <BLANKLINE> | 461 | <BLANKLINE> |
| 192 | 443 | ---------------------------------------------------------------------- | 462 | ---------------------------------------------------------------------- |
| 193 | 444 | 463 | ||
| 194 | @@ -615,11 +634,12 @@ | |||
| 195 | 615 | <BLANKLINE> | 634 | <BLANKLINE> |
| 196 | 616 | -- = | 635 | -- = |
| 197 | 617 | <BLANKLINE> | 636 | <BLANKLINE> |
| 198 | 618 | Firefox does not support SVG | ||
| 199 | 619 | http://bugs.launchpad.dev/bugs/1 | ||
| 200 | 620 | You received this bug notification because you are subscribed to | 637 | You received this bug notification because you are subscribed to |
| 201 | 621 | mozilla-firefox in ubuntu. | 638 | mozilla-firefox in ubuntu. |
| 202 | 639 | http://bugs.launchpad.dev/bugs/1 | ||
| 203 | 622 | <BLANKLINE> | 640 | <BLANKLINE> |
| 204 | 641 | Title: | ||
| 205 | 642 | Firefox does not support SVG | ||
| 206 | 623 | INFO Notifying marilize@hbd.com about bug 1. | 643 | INFO Notifying marilize@hbd.com about bug 1. |
| 207 | 624 | ... | 644 | ... |
| 208 | 625 | INFO Notifying mark@example.com about bug 1. | 645 | INFO Notifying mark@example.com about bug 1. |
| 209 | @@ -959,10 +979,12 @@ | |||
| 210 | 959 | a really simple comment. | 979 | a really simple comment. |
| 211 | 960 | <BLANKLINE> | 980 | <BLANKLINE> |
| 212 | 961 | -- | 981 | -- |
| 213 | 962 | Foo is broken | ||
| 214 | 963 | http://bugs.launchpad.dev/bugs/... | ||
| 215 | 964 | You received this bug notification because you are a direct subscriber | 982 | You received this bug notification because you are a direct subscriber |
| 216 | 965 | of the bug. | 983 | of the bug. |
| 217 | 984 | http://bugs.launchpad.dev/bugs/... | ||
| 218 | 985 | <BLANKLINE> | ||
| 219 | 986 | Title: | ||
| 220 | 987 | Foo is broken | ||
| 221 | 966 | <BLANKLINE> | 988 | <BLANKLINE> |
| 222 | 967 | ---------------------------------------------------------------------- | 989 | ---------------------------------------------------------------------- |
| 223 | 968 | 990 | ||
| 224 | @@ -978,10 +1000,12 @@ | |||
| 225 | 978 | a really simple comment. | 1000 | a really simple comment. |
| 226 | 979 | <BLANKLINE> | 1001 | <BLANKLINE> |
| 227 | 980 | -- | 1002 | -- |
| 228 | 981 | Foo is broken | ||
| 229 | 982 | http://bugs.launchpad.dev/bugs/... | ||
| 230 | 983 | You received this bug notification because you are a member of Verbose | 1003 | You received this bug notification because you are a member of Verbose |
| 231 | 984 | Team, which is a direct subscriber. | 1004 | Team, which is a direct subscriber. |
| 232 | 1005 | http://bugs.launchpad.dev/bugs/... | ||
| 233 | 1006 | <BLANKLINE> | ||
| 234 | 1007 | Title: | ||
| 235 | 1008 | Foo is broken | ||
| 236 | 985 | <BLANKLINE> | 1009 | <BLANKLINE> |
| 237 | 986 | ---------------------------------------------------------------------- | 1010 | ---------------------------------------------------------------------- |
| 238 | 987 | 1011 | ||
| 239 | @@ -996,15 +1020,18 @@ | |||
| 240 | 996 | a really simple comment. | 1020 | a really simple comment. |
| 241 | 997 | <BLANKLINE> | 1021 | <BLANKLINE> |
| 242 | 998 | -- | 1022 | -- |
| 243 | 999 | Foo is broken | ||
| 244 | 1000 | http://bugs.launchpad.dev/bugs/... | ||
| 245 | 1001 | You received this bug notification because you are a direct subscriber | 1023 | You received this bug notification because you are a direct subscriber |
| 246 | 1002 | of the bug. | 1024 | of the bug. |
| 249 | 1003 | <BLANKLINE> | 1025 | http://bugs.launchpad.dev/bugs/... |
| 250 | 1004 | Status in Foo: New | 1026 | <BLANKLINE> |
| 251 | 1027 | Title: | ||
| 252 | 1028 | Foo is broken | ||
| 253 | 1029 | <BLANKLINE> | ||
| 254 | 1030 | Status in Foo: | ||
| 255 | 1031 | New | ||
| 256 | 1005 | <BLANKLINE> | 1032 | <BLANKLINE> |
| 257 | 1006 | Bug description: | 1033 | Bug description: |
| 259 | 1007 | desc | 1034 | desc |
| 260 | 1008 | <BLANKLINE> | 1035 | <BLANKLINE> |
| 261 | 1009 | To unsubscribe from this bug, go to: | 1036 | To unsubscribe from this bug, go to: |
| 262 | 1010 | http://bugs.launchpad.dev/.../+bug/.../+subscribe | 1037 | http://bugs.launchpad.dev/.../+bug/.../+subscribe |
| 263 | @@ -1022,15 +1049,18 @@ | |||
| 264 | 1022 | a really simple comment. | 1049 | a really simple comment. |
| 265 | 1023 | <BLANKLINE> | 1050 | <BLANKLINE> |
| 266 | 1024 | -- | 1051 | -- |
| 267 | 1025 | Foo is broken | ||
| 268 | 1026 | http://bugs.launchpad.dev/bugs/... | ||
| 269 | 1027 | You received this bug notification because you are a member of Concise | 1052 | You received this bug notification because you are a member of Concise |
| 270 | 1028 | Team, which is a direct subscriber. | 1053 | Team, which is a direct subscriber. |
| 273 | 1029 | <BLANKLINE> | 1054 | http://bugs.launchpad.dev/bugs/... |
| 274 | 1030 | Status in Foo: New | 1055 | <BLANKLINE> |
| 275 | 1056 | Title: | ||
| 276 | 1057 | Foo is broken | ||
| 277 | 1058 | <BLANKLINE> | ||
| 278 | 1059 | Status in Foo: | ||
| 279 | 1060 | New | ||
| 280 | 1031 | <BLANKLINE> | 1061 | <BLANKLINE> |
| 281 | 1032 | Bug description: | 1062 | Bug description: |
| 283 | 1033 | desc | 1063 | desc |
| 284 | 1034 | <BLANKLINE> | 1064 | <BLANKLINE> |
| 285 | 1035 | ---------------------------------------------------------------------- | 1065 | ---------------------------------------------------------------------- |
| 286 | 1036 | 1066 | ||
| 287 | @@ -1075,18 +1105,18 @@ | |||
| 288 | 1075 | ... | 1105 | ... |
| 289 | 1076 | You received this bug notification because you are subscribed to | 1106 | You received this bug notification because you are subscribed to |
| 290 | 1077 | mozilla-firefox in ubuntu. | 1107 | mozilla-firefox in ubuntu. |
| 292 | 1078 | <BLANKLINE> | 1108 | ... |
| 293 | 1079 | ---------------------------------------------------------------------- | 1109 | ---------------------------------------------------------------------- |
| 294 | 1080 | To: marilize@hbd.com | 1110 | To: marilize@hbd.com |
| 295 | 1081 | ... | 1111 | ... |
| 296 | 1082 | You received this bug notification because you are a member of ShipIt | 1112 | You received this bug notification because you are a member of ShipIt |
| 297 | 1083 | Administrators, which is a direct subscriber. | 1113 | Administrators, which is a direct subscriber. |
| 299 | 1084 | <BLANKLINE> | 1114 | ... |
| 300 | 1085 | ---------------------------------------------------------------------- | 1115 | ---------------------------------------------------------------------- |
| 301 | 1086 | To: mark@example.com | 1116 | To: mark@example.com |
| 302 | 1087 | ... | 1117 | ... |
| 303 | 1088 | You received this bug notification because you are a bug assignee. | 1118 | You received this bug notification because you are a bug assignee. |
| 305 | 1089 | <BLANKLINE> | 1119 | ... |
| 306 | 1090 | ---------------------------------------------------------------------- | 1120 | ---------------------------------------------------------------------- |
| 307 | 1091 | To: no-priv@canonical.com | 1121 | To: no-priv@canonical.com |
| 308 | 1092 | From: Sample Person <...@bugs.launchpad.net> | 1122 | From: Sample Person <...@bugs.launchpad.net> |
| 309 | @@ -1096,23 +1126,21 @@ | |||
| 310 | 1096 | another comment. | 1126 | another comment. |
| 311 | 1097 | <BLANKLINE> | 1127 | <BLANKLINE> |
| 312 | 1098 | -- | 1128 | -- |
| 313 | 1099 | Firefox does not support SVG | ||
| 314 | 1100 | http://bugs.launchpad.dev/bugs/1 | ||
| 315 | 1101 | You received this bug notification because you are subscribed to Mozilla | 1129 | You received this bug notification because you are subscribed to Mozilla |
| 316 | 1102 | Firefox. | 1130 | Firefox. |
| 318 | 1103 | <BLANKLINE> | 1131 | ... |
| 319 | 1104 | ---------------------------------------------------------------------- | 1132 | ---------------------------------------------------------------------- |
| 320 | 1105 | To: support@ubuntu.com | 1133 | To: support@ubuntu.com |
| 321 | 1106 | ... | 1134 | ... |
| 322 | 1107 | You received this bug notification because you are a member of Ubuntu | 1135 | You received this bug notification because you are a member of Ubuntu |
| 323 | 1108 | Team, which is the registrant for Ubuntu. | 1136 | Team, which is the registrant for Ubuntu. |
| 325 | 1109 | <BLANKLINE> | 1137 | ... |
| 326 | 1110 | ---------------------------------------------------------------------- | 1138 | ---------------------------------------------------------------------- |
| 327 | 1111 | To: test@canonical.com | 1139 | To: test@canonical.com |
| 328 | 1112 | ... | 1140 | ... |
| 329 | 1113 | You received this bug notification because you are a direct subscriber | 1141 | You received this bug notification because you are a direct subscriber |
| 330 | 1114 | of the bug. | 1142 | of the bug. |
| 332 | 1115 | <BLANKLINE> | 1143 | ... |
| 333 | 1116 | ---------------------------------------------------------------------- | 1144 | ---------------------------------------------------------------------- |
| 334 | 1117 | 1145 | ||
| 335 | 1118 | If Sample Person's notification level is set to METADATA, he receives | 1146 | If Sample Person's notification level is set to METADATA, he receives |
| 336 | @@ -1138,7 +1166,7 @@ | |||
| 337 | 1138 | ... | 1166 | ... |
| 338 | 1139 | You received this bug notification because you are subscribed to | 1167 | You received this bug notification because you are subscribed to |
| 339 | 1140 | mozilla-firefox in ubuntu. | 1168 | mozilla-firefox in ubuntu. |
| 341 | 1141 | <BLANKLINE> | 1169 | ... |
| 342 | 1142 | ---------------------------------------------------------------------- | 1170 | ---------------------------------------------------------------------- |
| 343 | 1143 | To: marilize@hbd.com | 1171 | To: marilize@hbd.com |
| 344 | 1144 | From: Sample Person <...@bugs.launchpad.net> | 1172 | From: Sample Person <...@bugs.launchpad.net> |
| 345 | @@ -1148,28 +1176,26 @@ | |||
| 346 | 1148 | no comment for no-priv. | 1176 | no comment for no-priv. |
| 347 | 1149 | <BLANKLINE> | 1177 | <BLANKLINE> |
| 348 | 1150 | -- | 1178 | -- |
| 349 | 1151 | Firefox does not support SVG | ||
| 350 | 1152 | http://bugs.launchpad.dev/bugs/1 | ||
| 351 | 1153 | You received this bug notification because you are a member of ShipIt | 1179 | You received this bug notification because you are a member of ShipIt |
| 352 | 1154 | Administrators, which is a direct subscriber. | 1180 | Administrators, which is a direct subscriber. |
| 354 | 1155 | <BLANKLINE> | 1181 | ... |
| 355 | 1156 | ---------------------------------------------------------------------- | 1182 | ---------------------------------------------------------------------- |
| 356 | 1157 | To: mark@example.com | 1183 | To: mark@example.com |
| 357 | 1158 | ... | 1184 | ... |
| 358 | 1159 | You received this bug notification because you are a bug assignee. | 1185 | You received this bug notification because you are a bug assignee. |
| 360 | 1160 | <BLANKLINE> | 1186 | ... |
| 361 | 1161 | ---------------------------------------------------------------------- | 1187 | ---------------------------------------------------------------------- |
| 362 | 1162 | To: support@ubuntu.com | 1188 | To: support@ubuntu.com |
| 363 | 1163 | ... | 1189 | ... |
| 364 | 1164 | You received this bug notification because you are a member of Ubuntu | 1190 | You received this bug notification because you are a member of Ubuntu |
| 365 | 1165 | Team, which is the registrant for Ubuntu. | 1191 | Team, which is the registrant for Ubuntu. |
| 367 | 1166 | <BLANKLINE> | 1192 | ... |
| 368 | 1167 | ---------------------------------------------------------------------- | 1193 | ---------------------------------------------------------------------- |
| 369 | 1168 | To: test@canonical.com | 1194 | To: test@canonical.com |
| 370 | 1169 | ... | 1195 | ... |
| 371 | 1170 | You received this bug notification because you are a direct subscriber | 1196 | You received this bug notification because you are a direct subscriber |
| 372 | 1171 | of the bug. | 1197 | of the bug. |
| 374 | 1172 | <BLANKLINE> | 1198 | ... |
| 375 | 1173 | ---------------------------------------------------------------------- | 1199 | ---------------------------------------------------------------------- |
| 376 | 1174 | 1200 | ||
| 377 | 1175 | The notifications generated by addChangeNotification() are sent only to | 1201 | The notifications generated by addChangeNotification() are sent only to |
| 378 | @@ -1189,18 +1215,19 @@ | |||
| 379 | 1189 | ... | 1215 | ... |
| 380 | 1190 | You received this bug notification because you are subscribed to | 1216 | You received this bug notification because you are subscribed to |
| 381 | 1191 | mozilla-firefox in ubuntu. | 1217 | mozilla-firefox in ubuntu. |
| 383 | 1192 | <BLANKLINE> | 1218 | http://bugs.launchpad.dev/bugs/1 |
| 384 | 1219 | ... | ||
| 385 | 1193 | ---------------------------------------------------------------------- | 1220 | ---------------------------------------------------------------------- |
| 386 | 1194 | To: marilize@hbd.com | 1221 | To: marilize@hbd.com |
| 387 | 1195 | ... | 1222 | ... |
| 388 | 1196 | You received this bug notification because you are a member of ShipIt | 1223 | You received this bug notification because you are a member of ShipIt |
| 389 | 1197 | Administrators, which is a direct subscriber. | 1224 | Administrators, which is a direct subscriber. |
| 391 | 1198 | <BLANKLINE> | 1225 | ... |
| 392 | 1199 | ---------------------------------------------------------------------- | 1226 | ---------------------------------------------------------------------- |
| 393 | 1200 | To: mark@example.com | 1227 | To: mark@example.com |
| 394 | 1201 | ... | 1228 | ... |
| 395 | 1202 | You received this bug notification because you are a bug assignee. | 1229 | You received this bug notification because you are a bug assignee. |
| 397 | 1203 | <BLANKLINE> | 1230 | ... |
| 398 | 1204 | ---------------------------------------------------------------------- | 1231 | ---------------------------------------------------------------------- |
| 399 | 1205 | To: no-priv@canonical.com | 1232 | To: no-priv@canonical.com |
| 400 | 1206 | From: Sample Person <...@bugs.launchpad.net> | 1233 | From: Sample Person <...@bugs.launchpad.net> |
| 401 | @@ -1211,24 +1238,22 @@ | |||
| 402 | 1211 | <BLANKLINE> | 1238 | <BLANKLINE> |
| 403 | 1212 | ** Summary changed to: whatever. | 1239 | ** Summary changed to: whatever. |
| 404 | 1213 | <BLANKLINE> | 1240 | <BLANKLINE> |
| 408 | 1214 | -- | 1241 | -- |
| 406 | 1215 | Firefox does not support SVG | ||
| 407 | 1216 | http://bugs.launchpad.dev/bugs/1 | ||
| 409 | 1217 | You received this bug notification because you are subscribed to Mozilla | 1242 | You received this bug notification because you are subscribed to Mozilla |
| 410 | 1218 | Firefox. | 1243 | Firefox. |
| 412 | 1219 | <BLANKLINE> | 1244 | ... |
| 413 | 1220 | ---------------------------------------------------------------------- | 1245 | ---------------------------------------------------------------------- |
| 414 | 1221 | To: support@ubuntu.com | 1246 | To: support@ubuntu.com |
| 415 | 1222 | ... | 1247 | ... |
| 416 | 1223 | You received this bug notification because you are a member of Ubuntu | 1248 | You received this bug notification because you are a member of Ubuntu |
| 417 | 1224 | Team, which is the registrant for Ubuntu. | 1249 | Team, which is the registrant for Ubuntu. |
| 419 | 1225 | <BLANKLINE> | 1250 | ... |
| 420 | 1226 | ---------------------------------------------------------------------- | 1251 | ---------------------------------------------------------------------- |
| 421 | 1227 | To: test@canonical.com | 1252 | To: test@canonical.com |
| 422 | 1228 | ... | 1253 | ... |
| 423 | 1229 | You received this bug notification because you are a direct subscriber | 1254 | You received this bug notification because you are a direct subscriber |
| 424 | 1230 | of the bug. | 1255 | of the bug. |
| 426 | 1231 | <BLANKLINE> | 1256 | ... |
| 427 | 1232 | ---------------------------------------------------------------------- | 1257 | ---------------------------------------------------------------------- |
| 428 | 1233 | 1258 | ||
| 429 | 1234 | If Sample Person sets his notification level to LIFECYCLE, he receives | 1259 | If Sample Person sets his notification level to LIFECYCLE, he receives |
| 430 | @@ -1252,6 +1277,7 @@ | |||
| 431 | 1252 | ... | 1277 | ... |
| 432 | 1253 | You received this bug notification because you are subscribed to | 1278 | You received this bug notification because you are subscribed to |
| 433 | 1254 | mozilla-firefox in ubuntu. | 1279 | mozilla-firefox in ubuntu. |
| 434 | 1280 | ... | ||
| 435 | 1255 | <BLANKLINE> | 1281 | <BLANKLINE> |
| 436 | 1256 | ---------------------------------------------------------------------- | 1282 | ---------------------------------------------------------------------- |
| 437 | 1257 | To: marilize@hbd.com | 1283 | To: marilize@hbd.com |
| 438 | @@ -1261,27 +1287,29 @@ | |||
| 439 | 1261 | <BLANKLINE> | 1287 | <BLANKLINE> |
| 440 | 1262 | ** Summary changed to: something. | 1288 | ** Summary changed to: something. |
| 441 | 1263 | <BLANKLINE> | 1289 | <BLANKLINE> |
| 445 | 1264 | -- | 1290 | -- |
| 443 | 1265 | Firefox does not support SVG | ||
| 444 | 1266 | http://bugs.launchpad.dev/bugs/1 | ||
| 446 | 1267 | You received this bug notification because you are a member of ShipIt | 1291 | You received this bug notification because you are a member of ShipIt |
| 447 | 1268 | Administrators, which is a direct subscriber. | 1292 | Administrators, which is a direct subscriber. |
| 448 | 1293 | http://bugs.launchpad.dev/bugs/1 | ||
| 449 | 1294 | <BLANKLINE> | ||
| 450 | 1295 | Title: | ||
| 451 | 1296 | Firefox does not support SVG | ||
| 452 | 1269 | <BLANKLINE> | 1297 | <BLANKLINE> |
| 453 | 1270 | ---------------------------------------------------------------------- | 1298 | ---------------------------------------------------------------------- |
| 454 | 1271 | To: mark@example.com | 1299 | To: mark@example.com |
| 455 | 1272 | ... | 1300 | ... |
| 456 | 1273 | You received this bug notification because you are a bug assignee. | 1301 | You received this bug notification because you are a bug assignee. |
| 458 | 1274 | <BLANKLINE> | 1302 | ... |
| 459 | 1275 | ---------------------------------------------------------------------- | 1303 | ---------------------------------------------------------------------- |
| 460 | 1276 | To: support@ubuntu.com | 1304 | To: support@ubuntu.com |
| 461 | 1277 | ... | 1305 | ... |
| 462 | 1278 | You received this bug notification because you are a member of Ubuntu | 1306 | You received this bug notification because you are a member of Ubuntu |
| 463 | 1279 | Team, which is the registrant for Ubuntu. | 1307 | Team, which is the registrant for Ubuntu. |
| 465 | 1280 | <BLANKLINE> | 1308 | ... |
| 466 | 1281 | ---------------------------------------------------------------------- | 1309 | ---------------------------------------------------------------------- |
| 467 | 1282 | To: test@canonical.com | 1310 | To: test@canonical.com |
| 468 | 1283 | ... | 1311 | ... |
| 469 | 1284 | You received this bug notification because you are a direct subscriber | 1312 | You received this bug notification because you are a direct subscriber |
| 470 | 1285 | of the bug. | 1313 | of the bug. |
| 472 | 1286 | <BLANKLINE> | 1314 | ... |
| 473 | 1287 | ---------------------------------------------------------------------- | 1315 | ---------------------------------------------------------------------- |
| 474 | 1288 | 1316 | ||
| 475 | === modified file 'lib/lp/bugs/scripts/bugnotification.py' | |||
| 476 | --- lib/lp/bugs/scripts/bugnotification.py 2010-09-24 22:30:48 +0000 | |||
| 477 | +++ lib/lp/bugs/scripts/bugnotification.py 2010-11-26 14:08:20 +0000 | |||
| 478 | @@ -16,23 +16,18 @@ | |||
| 479 | 16 | from operator import itemgetter | 16 | from operator import itemgetter |
| 480 | 17 | 17 | ||
| 481 | 18 | import transaction | 18 | import transaction |
| 482 | 19 | from zope.component import getUtility | ||
| 483 | 20 | 19 | ||
| 484 | 21 | from canonical.config import config | ||
| 485 | 22 | from canonical.launchpad.helpers import ( | 20 | from canonical.launchpad.helpers import ( |
| 486 | 23 | emailPeople, | 21 | emailPeople, |
| 487 | 24 | get_email_template, | 22 | get_email_template, |
| 488 | 25 | ) | 23 | ) |
| 489 | 26 | from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities | ||
| 490 | 27 | from canonical.launchpad.scripts.logger import log | 24 | from canonical.launchpad.scripts.logger import log |
| 491 | 28 | from canonical.launchpad.webapp import canonical_url | 25 | from canonical.launchpad.webapp import canonical_url |
| 492 | 29 | from lp.bugs.interfaces.bugmessage import IBugMessageSet | ||
| 493 | 30 | from lp.bugs.mail.bugnotificationbuilder import ( | 26 | from lp.bugs.mail.bugnotificationbuilder import ( |
| 494 | 31 | BugNotificationBuilder, | 27 | BugNotificationBuilder, |
| 495 | 32 | get_bugmail_from_address, | 28 | get_bugmail_from_address, |
| 496 | 33 | ) | 29 | ) |
| 497 | 34 | from lp.bugs.mail.newbug import generate_bug_add_email | 30 | from lp.bugs.mail.newbug import generate_bug_add_email |
| 498 | 35 | from lp.registry.interfaces.person import IPersonSet | ||
| 499 | 36 | from lp.services.mail.mailwrapper import MailWrapper | 31 | from lp.services.mail.mailwrapper import MailWrapper |
| 500 | 37 | 32 | ||
| 501 | 38 | 33 | ||
| 502 | @@ -138,7 +133,7 @@ | |||
| 503 | 138 | email_template = 'bug-notification-verbose.txt' | 133 | email_template = 'bug-notification-verbose.txt' |
| 504 | 139 | body_data['bug_description'] = bug.description | 134 | body_data['bug_description'] = bug.description |
| 505 | 140 | 135 | ||
| 507 | 141 | status_base = "Status in %s: %s" | 136 | status_base = "Status in %s:\n %s" |
| 508 | 142 | status_strings = [] | 137 | status_strings = [] |
| 509 | 143 | for bug_task in bug.bugtasks: | 138 | for bug_task in bug.bugtasks: |
| 510 | 144 | status_strings.append(status_base % (bug_task.target.title, | 139 | status_strings.append(status_base % (bug_task.target.title, |
looks good