diff options
author | Elliot Smith <elliot.smith@intel.com> | 2015-10-06 20:05:22 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-10-11 05:33:04 +0100 |
commit | dd957fe0f261db6481882fee0413f459425000c2 (patch) | |
tree | 74b9f3e3483da9cf43c787705398578df8be303d /bitbake/lib/toaster/toastergui | |
parent | ce9011a9dea4d4f8040170c28031cfbcadfbfd81 (diff) | |
download | poky-dd957fe0f261db6481882fee0413f459425000c2.tar.gz |
bitbake: toaster: Rationalise mimetype guessing to fix artifact downloads
Artifact download links were broken because the function to
get the mimetype for the artifact was incorrectly using the
underlying mimetype library. The function was also attached
to the build environment controller, which was unnecessary, as
we only support local controllers anyway.
Remove the mimetype getter on the build environment and
use the one in the view code instead. This works correctly
and prevents the download error from occurring.
[YOCTO #8369]
(Bitbake rev: 805fb2a9388c728600596e9b845a5c7eeaebd99c)
Signed-off-by: Elliot Smith <elliot.smith@intel.com>
Signed-off-by: brian avery <avery.brian@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster/toastergui')
-rwxr-xr-x | bitbake/lib/toaster/toastergui/views.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py index 6e5815595f..839ee78f97 100755 --- a/bitbake/lib/toaster/toastergui/views.py +++ b/bitbake/lib/toaster/toastergui/views.py | |||
@@ -2981,7 +2981,7 @@ if True: | |||
2981 | if file_name is None: | 2981 | if file_name is None: |
2982 | raise Exception("Could not handle artifact %s id %s" % (artifact_type, artifact_id)) | 2982 | raise Exception("Could not handle artifact %s id %s" % (artifact_type, artifact_id)) |
2983 | else: | 2983 | else: |
2984 | content_type = b.buildrequest.environment.get_artifact_type(file_name) | 2984 | content_type = MimeTypeFinder.get_mimetype(file_name) |
2985 | fsock = b.buildrequest.environment.get_artifact(file_name) | 2985 | fsock = b.buildrequest.environment.get_artifact(file_name) |
2986 | file_name = os.path.basename(file_name) # we assume that the build environment system has the same path conventions as host | 2986 | file_name = os.path.basename(file_name) # we assume that the build environment system has the same path conventions as host |
2987 | 2987 | ||