summaryrefslogtreecommitdiffstats
path: root/nova/virt
diff options
context:
space:
mode:
authorMichael Still <mikal@stillhq.com>2012-03-28 15:00:45 +1100
committerMichael Still <mikal@stillhq.com>2012-03-29 09:49:01 +1100
commit38bc2d329581bf85d131e0025a13c7e87ea9f107 (patch)
tree51c60f26bbfcab6191126f2aa50f8794814df849 /nova/virt
parent998e57b29629946a9da96db3aed013ab895dc482 (diff)
Base image signature files are not images.
Stop treating base image signature files as images. Resolves bug 967843. Change-Id: Iad2f27e07a6a9887785bb4dab44476c62cd11a69
Diffstat (limited to 'nova/virt')
-rw-r--r--nova/virt/libvirt/imagecache.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/nova/virt/libvirt/imagecache.py b/nova/virt/libvirt/imagecache.py
index 07bab5cd3..092ab1d05 100644
--- a/nova/virt/libvirt/imagecache.py
+++ b/nova/virt/libvirt/imagecache.py
@@ -134,7 +134,9 @@ class ImageCacheManager(object):
if len(ent) == digest_size:
self._store_image(base_dir, ent, original=True)
- elif len(ent) > digest_size + 2 and ent[digest_size] == '_':
+ elif (len(ent) > digest_size + 2 and
+ ent[digest_size] == '_' and
+ not ent.endswith('.sha1')):
self._store_image(base_dir, ent, original=False)
def _list_running_instances(self, context):