Merge lp:~cjwatson/launchpad/build-failure-help into lp:launchpad

Proposed by Colin Watson
Status: Merged
Merged at revision: 18851
Proposed branch: lp:~cjwatson/launchpad/build-failure-help
Merge into: lp:launchpad
Diff against target: 38 lines (+6/-3)
3 files modified
lib/lp/soyuz/doc/build-failedtoupload-workflow.txt (+2/-1)
lib/lp/soyuz/emailtemplates/build-notification.txt (+2/-1)
lib/lp/soyuz/tests/test_build_notify.py (+2/-1)
To merge this branch: bzr merge lp:~cjwatson/launchpad/build-failure-help
Reviewer Review Type Date Requested Status
William Grant code Approve
Review via email: mp+361394@code.launchpad.net

Commit message

Direct build failure support to Launchpad Answers rather than to the launchpad-buildd-admins team.

To post a comment you must log in.
Revision history for this message
William Grant (wgrant) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'lib/lp/soyuz/doc/build-failedtoupload-workflow.txt'
--- lib/lp/soyuz/doc/build-failedtoupload-workflow.txt 2018-05-27 18:32:33 +0000
+++ lib/lp/soyuz/doc/build-failedtoupload-workflow.txt 2019-01-05 09:51:24 +0000
@@ -97,7 +97,8 @@
97 ANY OUTPUT97 ANY OUTPUT
98 <BLANKLINE>98 <BLANKLINE>
99 If you want further information about this situation, feel free to99 If you want further information about this situation, feel free to
100 contact a member of the Launchpad Buildd Administrators team.100 contact us by asking a question on Launchpad
101 (https://answers.launchpad.net/launchpad/+addquestion).
101 <BLANKLINE>102 <BLANKLINE>
102 -- =103 -- =
103 <BLANKLINE>104 <BLANKLINE>
104105
=== modified file 'lib/lp/soyuz/emailtemplates/build-notification.txt'
--- lib/lp/soyuz/emailtemplates/build-notification.txt 2015-07-14 10:57:46 +0000
+++ lib/lp/soyuz/emailtemplates/build-notification.txt 2019-01-05 09:51:24 +0000
@@ -13,4 +13,5 @@
13%(extra_info)s13%(extra_info)s
1414
15If you want further information about this situation, feel free to15If you want further information about this situation, feel free to
16contact a member of the Launchpad Buildd Administrators team.16contact us by asking a question on Launchpad
17(https://answers.launchpad.net/launchpad/+addquestion).
1718
=== modified file 'lib/lp/soyuz/tests/test_build_notify.py'
--- lib/lp/soyuz/tests/test_build_notify.py 2018-02-02 03:14:35 +0000
+++ lib/lp/soyuz/tests/test_build_notify.py 2019-01-05 09:51:24 +0000
@@ -171,7 +171,8 @@
171171
172172
173 If you want further information about this situation, feel free to173 If you want further information about this situation, feel free to
174 contact a member of the Launchpad Buildd Administrators team.174 contact us by asking a question on Launchpad
175 (https://answers.launchpad.net/launchpad/+addquestion).
175176
176 %s177 %s
177 %s178 %s