[pkg-eucalyptus-commits] [euca2ools] 39/41: Ensure we don't register ramdisk images as machine images

[Charles Plessy]

This is an automated email from the git hooks/post-receive script.

plessy pushed a commit to branch master
in repository euca2ools.

commit 62ee82942cd216828e19ba3641a258d8d6797eff
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Mon Sep 30 18:00:50 2013 -0700

    Ensure we don't register ramdisk images as machine images
---
 euca2ools/commands/eustore/installimage.py |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/euca2ools/commands/eustore/installimage.py b/euca2ools/commands/eustore/installimage.py
index 85a1744..340f1f9 100644
--- a/euca2ools/commands/eustore/installimage.py
+++ b/euca2ools/commands/eustore/installimage.py
@@ -349,6 +349,12 @@ class InstallImage(EuStoreRequest, FileTransferProgressBarMixin):
             for member in members:
                 if member.name in bundled_images:
                     continue
+                if any(s in member.name for s in ('initrd', 'initramfs',
+                                                  'loader')):
+                    # Make sure we don't accidentally register a ramdisk image.
+                    # This can happen when use of --ramdisk prevents us from
+                    # pruning it later.
+                    continue
                 if machine_id is None and member.name.endswith('.img'):
                     bundled_images.append(member.name)
                     machine_image = self.extract_without_path(

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-eucalyptus/euca2ools.git