[pkg-eucalyptus-commits] [SCM] managing cloud instances for Eucalyptus branch, master, updated. 3.0.0-alpha3-257-g1da8e3a

[Garrett Holmstrom]

The following commit has been merged in the master branch:
commit 4e0ac50dcec19979a85646241b70f59918578235
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Fri Apr 26 18:27:33 2013 -0700

    Re-add deprecated -k option to eustore-install-image

diff --git a/euca2ools/commands/eustore/installimage.py b/euca2ools/commands/eustore/installimage.py
index 039ff22..0034ba8 100644
--- a/euca2ools/commands/eustore/installimage.py
+++ b/euca2ools/commands/eustore/installimage.py
@@ -71,7 +71,7 @@ class InstallImage(EuStoreRequest, FileTransferProgressBarMixin):
             Arg('--hypervisor', choices=('xen', 'kvm', 'universal'),
                 help='''hypervisor the kernel image is built for (required for
                 images with hypervisor-specific kernels'''),
-            Arg('--kernel-type', dest='kernel_type',
+            Arg('-k', '--kernel-type', dest='kernel_type',
                 choices=('xen', 'kvm', 'universal'), help=argparse.SUPPRESS),
             Arg('-d', '--directory', dest='directory', metavar='DIR',
                 help='''location to place the image and other artifacts
@@ -107,7 +107,7 @@ class InstallImage(EuStoreRequest, FileTransferProgressBarMixin):
         if self.args.get('kernel_type'):
             # Use it and complain
             self.args['hypervisor'] = self.args['kernel_type']
-            msg = ('argument --kernel-type is deprecated; use --hypervisor '
+            msg = ('argument -k/--kernel-type is deprecated; use --hypervisor '
                    'instead')
             self.log.warn(msg)
             print >> sys.stderr, 'warning:', msg

-- 
managing cloud instances for Eucalyptus