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

[Matt Spaulding]

The following commit has been merged in the master branch:
commit 8bfb0c33255ccf4838f9bcc6f71373a9cb08b42a
Author: Matt Spaulding <mspaulding06 at gmail.com>
Date:   Tue May 14 14:58:21 2013 -0700

    Updated inhert args to use a single variable

diff --git a/euca2ools/commands/bundle/bundlevol.py b/euca2ools/commands/bundle/bundlevol.py
index 6d48e74..9550616 100644
--- a/euca2ools/commands/bundle/bundlevol.py
+++ b/euca2ools/commands/bundle/bundlevol.py
@@ -72,12 +72,13 @@ class BundleVol(BundleCreator):
                 help='''Bundle all directories (including mounted
                 filesystems).'''),
             MutuallyExclusiveArgList(
-                Arg('--no-inherit', dest='no_inherit', action='store_true',
-                    help='''Do not add instance metadata to the bundled image
-                    (defaults to inherting metadata).'''),
+                Arg('--no-inherit', dest='inherit', action='store_false',
+                    default=True, help='''Do not add instance metadata to the
+                    bundled image (defaults to inherting metadata).'''),
                 Arg('--inherit', dest='inherit', action='store_true',
-                    help='''Explicity inhert instance metadata and add it to
-                    the bundled image (this is the default behavior)''')),
+                    default=True, help='''Explicity inhert instance metadata
+                    and add it to the bundled image (this is the default
+                    behavior)''')),
             Arg('-i', '--include', metavar='FILE1,FILE2,...',
                 type=delimited_list(','), help='''Comma-separated list of
                 absolute file paths to include.'''),
@@ -172,7 +173,7 @@ class BundleVol(BundleCreator):
         self.args['user'] = self.args.get('user').replace('-', '')
 
     def main(self):
-        if self.args.get('inherit') or not self.args.get('no_inherit'):
+        if self.args.get('inherit'):
             self._inherit_metadata()
         
         image_file = ImageCreator(log=self.log, **self.args).run()

-- 
managing cloud instances for Eucalyptus