[pkg-eucalyptus-commits] [SCM] managing cloud instances for Eucalyptus branch, experimental, updated. debian/2.1.1-1_experimental1-51-g95835b7

[dkavanagh]

The following commit has been merged in the experimental branch:
commit 20ad54dad15eca9cf806f1bf980a714ecba459e8
Author: dkavanagh <dkavanagh at gmail.com>
Date:   Fri Nov 30 10:58:45 2012 -0500

    TOOLS-159, only warn if no kernel/ramdisk were specified

diff --git a/euca2ools/commands/eustore/installimage.py b/euca2ools/commands/eustore/installimage.py
index 7fa9fc1..e804b2a 100644
--- a/euca2ools/commands/eustore/installimage.py
+++ b/euca2ools/commands/eustore/installimage.py
@@ -392,7 +392,9 @@ class InstallImage(AWSQueryRequest):
                         if self.cli_options.kernel_type:
                             print >> sys.stderr, "The -k option will be ignored because the image is single-kernel"
                     else:
-                        if not(self.cli_options.kernel_type):
+                        # Warn about kernel type for multi-kernel images, but not if already installed
+                        # kernel/ramdisk have been specified.
+                        if not(self.cli_options.kernel_type) and not(self.cli_options.kernel):
                             print >> sys.stderr, "Error: The -k option must be specified because this image has separate kernels"
                             sys.exit(-1)
                     print "Downloading Image : ",image['description']

-- 
managing cloud instances for Eucalyptus