Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix MIME policy failure on python version upgrade (SC-201) #934

Merged
merged 5 commits into from
Jul 15, 2021
Merged

Fix MIME policy failure on python version upgrade (SC-201) #934

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c4c4516
Fix MIME policy failure on python version upgrade
TheRealFalcon Jul 1, 2021
143682d
Review comments
TheRealFalcon Jul 8, 2021
2021f72
flake8/pylint
TheRealFalcon Jul 8, 2021
b5dc77e
Merge branch 'main' into mime-policy
TheRealFalcon Jul 8, 2021
2be0969
Merge branch 'main' into mime-policy
blackboxsw Jul 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions cloudinit/sources/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,13 @@ def _unpickle(self, ci_pkl_version: int) -> None:
self.vendordata2 = None
if not hasattr(self, 'vendordata2_raw'):
self.vendordata2_raw = None
if hasattr(self, 'userdata') and self.userdata is not None:
# If userdata stores MIME data, on < python3.6 it will be
# missing the 'policy' attribute that exists on >=python3.6.
# Calling str() on the userdata will attempt to access this
# policy attribute. This will raise an exception, causing
# the pickle load to fail, so cloud-init will discard the cache
str(self.userdata)

def __str__(self):
return type_utils.obj_name(self)
Expand Down
Loading