openstack
/
heat
Code Issues Proposed changes

Ignore TypeErrors on old properties during update 

Extend the approach from 1cfde62b2f of
ignoring ValueErrors in the _previous_ properties when doing an update to
also ignoring TypeErrors.

Change-Id: Ic08165fe031e1764cfb34eaf782d3e105f04fee3
Closes-Bug: #1538551
Related-Bug: #1543685
This commit is contained in:
Zane Bitter 2016-03-01 17:56:33 -05:00
parent 782dbf0ece
commit 79c410d923
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
heat/engine/resource.py
View File

@ -504,7 +504,7 @@ class Resource(object):
def prop_changed(key):
try:
before = before_props.get(key)
except ValueError as exc:
except (TypeError, ValueError) as exc:
# We shouldn't get here usually, but there is a known issue
# with template resources and new parameters in non-convergence
# stacks (see bug 1543685). The error should be harmless