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

[Garrett Holmstrom]

The following commit has been merged in the experimental branch:
commit 553b9ee6e155a6503e1af47b1e43b9b7a03a1a6d
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Sat Jul 21 14:56:59 2012 -0700

    Minor cleanup

diff --git a/euca2ools/bundler.py b/euca2ools/bundler.py
index 5ffbc89..7162961 100644
--- a/euca2ools/bundler.py
+++ b/euca2ools/bundler.py
@@ -417,7 +417,7 @@ class Bundler(object):
         if mapping:
             block_dev_mapping_elem = \
                 doc.createElement('block_device_mapping')
-            for vname,dname in mapping.items():
+            for vname, dname in mapping.items():
                 mapping_elem = doc.createElement('mapping')
                 virtual_elem = doc.createElement('virtual')
                 virtual_value = doc.createTextNode(vname)
diff --git a/euca2ools/commands/euca/bundlevol.py b/euca2ools/commands/euca/bundlevol.py
index 0696b49..11051d0 100644
--- a/euca2ools/commands/euca/bundlevol.py
+++ b/euca2ools/commands/euca/bundlevol.py
@@ -245,7 +245,7 @@ class BundleVol(euca2ools.commands.eucacommand.EucaCommand):
              ancestor_ami_ids) = self.get_instance_metadata(self.ramdisk_id,
                                                             self.kernel_id,
                                                             self.block_device_mapping)
-        if self.product_codes and isinstance(self.product_codes,basestring):
+        if self.product_codes and isinstance(self.product_codes, basestring):
             self.product_codes = self.add_product_codes(self.product_codes)
 
         try:
diff --git a/euca2ools/commands/euca/createkeypair.py b/euca2ools/commands/euca/createkeypair.py
index 252590f..ec98b22 100644
--- a/euca2ools/commands/euca/createkeypair.py
+++ b/euca2ools/commands/euca/createkeypair.py
@@ -39,10 +39,10 @@ from stat import *
 class CreateKeyPair(euca2ools.commands.eucacommand.EucaCommand):
 
     Description = 'Creates a new key pair for use with instances'
-    Options = [Param(name='filename', short_name='f', 
+    Options = [Param(name='filename', short_name='f',
                   long_name='filename', ptype='string',
-                  doc='Filename to save the private key. Default ' +
-                  'action is to overwire the file.',
+                  doc='Filename to save the private key to. Default ' +
+                  'action is to overwite the file.',
                   optional=True)]
 
     Args = [Param(name='keypair_name', ptype='string',
@@ -65,7 +65,7 @@ class CreateKeyPair(euca2ools.commands.eucacommand.EucaCommand):
     def main(self):
         conn = self.make_connection_cli()
         return self.make_request_cli(conn, 'create_key_pair',
-                                      key_name=self.keypair_name)
+                                     key_name=self.keypair_name)
 
     def main_cli(self):
         keypair = self.main()
@@ -74,4 +74,3 @@ class CreateKeyPair(euca2ools.commands.eucacommand.EucaCommand):
             self.save_keypair_to_file(keypair)
         else:
             self.display_keypair(keypair)
-

-- 
managing cloud instances for Eucalyptus