openstack
/
heat
Code Issues Proposed changes

Merge "Avoid crash when registering resources"

This commit is contained in:
Jenkins 2015-05-29 01:43:39 +00:00 committed by Gerrit Code Review
parent 064cc2daa2 960c43c7cd
commit 15984e558d
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
heat/engine/environment.py
View File

@ -265,8 +265,9 @@ class ResourceRegistry(object):
if isinstance(info, ClassResourceInfo):
if info.value.support_status.status != support.SUPPORTED:
warnings.warn(encodeutils.safe_encode(
info.value.support_status.message))
if info.value.support_status.message is not None:
warnings.warn(encodeutils.safe_encode(
info.value.support_status.message))
info.user_resource = (self.global_registry is not None)
registry[name] = info