openstack/ironic
Code Issues Proposed changes

Merge "Post-CVE follow-up fix - um/yoga and older" into unmaintained/yoga

Browse Source
This commit is contained in:
Zuul 2024-09-12 20:00:40 +00:00 committed by Gerrit Code Review
commit fc46809591
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ironic/drivers/modules/image_cache.py
View File

@ -361,9 +361,9 @@ def _fetch(context, image_href, path, force_raw=False, expected_format=None):
# Notes(yjiang5): If glance can provide the virtual size information, # Notes(yjiang5): If glance can provide the virtual size information,
# then we can firstly clean cache and then invoke images.fetch(). # then we can firstly clean cache and then invoke images.fetch().
if (force_raw if (force_raw
and (disable_dii and ((disable_dii
and images.force_raw_will_convert(image_href, path_tmp)) and images.force_raw_will_convert(image_href, path_tmp))
or (not disable_dii and image_format != 'raw')): or (not disable_dii and image_format != 'raw'))):
required_space = images.converted_size(path_tmp, estimate=False) required_space = images.converted_size(path_tmp, estimate=False)
directory = os.path.dirname(path_tmp) directory = os.path.dirname(path_tmp)