diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-04-01 00:26:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-04-01 00:26:53 +0000 |
| commit | e3bd9b1c7898594131eb3d13e72e253876b1e903 (patch) | |
| tree | e37dd6177d77a7dbd8de465c2270e2a87366a9c1 | |
| parent | fa95aa06c2da812b3603bbea8c9a8e264b677842 (diff) | |
| parent | d586309b8f08152dcc83a6bc36f70b56d0ab5c53 (diff) | |
| download | nova-e3bd9b1c7898594131eb3d13e72e253876b1e903.tar.gz | |
Merge "Base image signature files are not images." into milestone-proposed
| -rw-r--r-- | nova/tests/test_imagecache.py | 1 | ||||
| -rw-r--r-- | nova/virt/libvirt/imagecache.py | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/nova/tests/test_imagecache.py b/nova/tests/test_imagecache.py index c748abbae8..722ec49ec8 100644 --- a/nova/tests/test_imagecache.py +++ b/nova/tests/test_imagecache.py @@ -77,6 +77,7 @@ class ImageCacheManagerTestCase(test.TestCase): 'e97222e91fc4241f49a7f520d1dcf446751129b3', '17d1b00b81642842e514494a78e804e9a511637c', '17d1b00b81642842e514494a78e804e9a511637c_5368709120', + '17d1b00b81642842e514494a78e804e9a511637c_5368709120.sha1', '17d1b00b81642842e514494a78e804e9a511637c_10737418240', '00000004'] diff --git a/nova/virt/libvirt/imagecache.py b/nova/virt/libvirt/imagecache.py index 25455a07c7..2709ebdc7f 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): |