Merge "Skip timestamp check if 'capabilities' is none"

This commit is contained in:
Jenkins 2013-02-21 05:26:30 +00:00 committed by Gerrit Code Review
commit 5ea0215cf2

View File

@ -116,10 +116,10 @@ class HostState(object):
def update_from_volume_capability(self, capability):
"""Update information about a host from its volume_node info."""
if self.updated and self.updated > capability['timestamp']:
return
if capability:
if self.updated and self.updated > capability['timestamp']:
return
self.volume_backend = capability.get('volume_backend_name', None)
self.vendor_name = capability.get('vendor_name', None)
self.driver_version = capability.get('driver_version', None)