Merge "Added a check for attachment['instance']"

This commit is contained in:
Jenkins 2012-06-06 19:14:49 +00:00 committed by Gerrit Code Review
commit d0d0b116a9

View File

@ -93,7 +93,8 @@ def get_attachment(volume):
args=(attachment["server_id"],))
# TODO(jake): Make "instance" the instance name
vals = {"url": url,
"name": attachment["instance"].name,
"name": attachment["instance"].name
if "instance" in attachment else None,
"instance": attachment["server_id"],
"dev": attachment["device"]}
attachments.append(link % vals)