summaryrefslogtreecommitdiffstats
path: root/nova/utils.py
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-02-03 13:14:42 +0000
committerGerrit Code Review <review@openstack.org>2013-02-03 13:14:42 +0000
commit5d490117cd31b5e11a5746d5124fb343f0749c02 (patch)
treec81442b5eb77f8b51ebb71c12e0b7259b547fb84 /nova/utils.py
parent2667e8fe2128c42c69bfb6163e96ad24f8151684 (diff)
parentacc30a869fa5b6c231fac713014f60216244672e (diff)
downloadnova-5d490117cd31b5e11a5746d5124fb343f0749c02.tar.gz
nova-5d490117cd31b5e11a5746d5124fb343f0749c02.tar.xz
nova-5d490117cd31b5e11a5746d5124fb343f0749c02.zip
Merge "Make system_metadata update in place"
Diffstat (limited to 'nova/utils.py')
-rw-r--r--nova/utils.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/utils.py b/nova/utils.py
index 83bf55583..cb75709ad 100644
--- a/nova/utils.py
+++ b/nova/utils.py
@@ -1291,5 +1291,6 @@ def last_bytes(file_like_object, num):
def metadata_to_dict(metadata):
result = {}
for item in metadata:
- result[item['key']] = item['value']
+ if not item.get('deleted'):
+ result[item['key']] = item['value']
return result