Be more cautious initing mimetypes
We use mimetypes to set file mime types for upload to log server locations. We also override yaml files mime type to text/plain when doing so. If we then call mimetypes.init() again this overrides the previous yaml update to text/plain. This wasn't a problem until python3.12 but python3.12 (on Ubuntu Noble specifically) seems to import test cases in a different order which results in the mimetypes.init() call in generate_manifest.py overriding the yaml mimetype set by the log upload test cases. Simply check if mimetypes is already inited before we init it again which should avoid the problem entirely. Note that this is likely to only ever by a testing issues as typically ansible wouldn't import all of this code together but the unittest runner does. Change-Id: Ifb9137ddd89713cad546129c462ad94315100940
This commit is contained in:
parent
7a58814cda
commit
a9a2f5ab50
@ -23,6 +23,8 @@ import sys
|
||||
from ansible.module_utils.basic import AnsibleModule
|
||||
|
||||
|
||||
if not mimetypes.inited:
|
||||
# We don't want to reinit and override any previously added types.
|
||||
mimetypes.init()
|
||||
|
||||
|
||||
|
@ -60,6 +60,8 @@ try:
|
||||
except ImportError:
|
||||
from collections import Sequence
|
||||
|
||||
if not mimetypes.inited:
|
||||
# We don't want to reinit and override any previously inited types.
|
||||
mimetypes.init()
|
||||
mimetypes.add_type('text/plain', '.yaml')
|
||||
|
||||
|
@ -47,6 +47,8 @@ try:
|
||||
except ImportError:
|
||||
from collections import Sequence
|
||||
|
||||
if not mimetypes.inited:
|
||||
# We don't want to reinit and override any previously added types.
|
||||
mimetypes.init()
|
||||
mimetypes.add_type('text/plain', '.yaml')
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user