diff options
author | Elliot Smith <elliot.smith@intel.com> | 2016-01-18 15:45:10 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-18 22:06:46 +0000 |
commit | f98e11c80951d39401d7caef8f8324969547b246 (patch) | |
tree | 1682c919c002f0940c4c4dfdb499dc633071a692 /bitbake/lib/toaster/toastergui/templates | |
parent | 68f3e1e0674e5ae8df3d2401b64aa86d782f14c6 (diff) | |
download | poky-f98e11c80951d39401d7caef8f8324969547b246.tar.gz |
bitbake: toastergui: make artifact download more robust
When an artifact download is requested, Toaster goes through a
convoluted series of conditions to decide which file to push
to the response. In the case of build artifact downloads for
command line builds, this caused an ugly exception, as command
line builds don't have a build request.
To simplify and catch more corner cases, remove the code which
fetches files via the build environment (we only support the local
build environment anyway). Then push all requests along a single
path, catching any missing file errors, missing object errors
or poorly-formed URLs in a single except clause which always returns
a valid response.
Also modify the text on the "unavailable artifact" page so it
says that the artifact doesn't exist, rather than it "no longer"
exists (exceptions may occur because an invalid artifact was
requested, rather than an artifact which was removed).
[YOCTO #7603]
(Bitbake rev: 24e20db55c2933de5e58ca754b8fd5b624f47820)
Signed-off-by: Elliot Smith <elliot.smith@intel.com>
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster/toastergui/templates')
-rw-r--r-- | bitbake/lib/toaster/toastergui/templates/unavailable_artifact.html | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/unavailable_artifact.html b/bitbake/lib/toaster/toastergui/templates/unavailable_artifact.html index 0301a6c608..2d3d02c2e1 100644 --- a/bitbake/lib/toaster/toastergui/templates/unavailable_artifact.html +++ b/bitbake/lib/toaster/toastergui/templates/unavailable_artifact.html | |||
@@ -3,15 +3,14 @@ | |||
3 | {% load humanize %} | 3 | {% load humanize %} |
4 | {% load static %} | 4 | {% load static %} |
5 | 5 | ||
6 | {% block title %} Build artifact no longer exists - Toaster {% endblock %} | 6 | {% block title %} Build artifact does not exist - Toaster {% endblock %} |
7 | 7 | ||
8 | {% block pagecontent %} | 8 | {% block pagecontent %} |
9 | 9 | <div class="row-fluid air"> | |
10 | <div class="row-fluid air"> | 10 | <div class="alert alert-info span8 lead"> |
11 | <div class="alert alert-info span8 lead"> | 11 | <p>The build artifact you are trying to download does not exist.</p> |
12 | <p"> The build artifact you are trying to download no longer exists.</p> | 12 | <p><a href="javascript:window.history.back()">Back to previous page</a></p> |
13 | <p><a href="javascript:window.history.back()">Back to previous page</a></p> | 13 | </div> |
14 | </div> | 14 | </div> |
15 | </div> | ||
16 | {% endblock %} | 15 | {% endblock %} |
17 | 16 | ||