[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 3d8f89afb28ad86cbebd16d72792184db3c29eae
Merge: b89af8fa79d97a94c033a3d97610035b723f448c 6b64b40580200ae17f24610eeb51989b4dbfbe19
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Sat Jul 21 14:38:52 2012 -0700

    Merge remote-tracking branch 'razrichter/master'
    
    Fixes TOOLS-106, TOOLS-107

diff --combined euca2ools/commands/euca/bundleimage.py
index 912384a,eea41de..352bcb0
--- a/euca2ools/commands/euca/bundleimage.py
+++ b/euca2ools/commands/euca/bundleimage.py
@@@ -81,7 -81,7 +81,7 @@@ class BundleImage(euca2ools.commands.eu
                 Param(name='target_arch',
                       short_name='r', long_name='arch',
                       optional=True, ptype='string', default='x86_64',
 -                     choices=['i386', 'x86_64'],
 +                     choices=['i386', 'x86_64', 'armhf'],
                       doc='Target architecture for the image.'),
                 Param(name='batch', long_name='batch',
                       optional=True, ptype='boolean',
@@@ -89,13 -89,12 +89,12 @@@
  
      def get_block_devs(self):
          mapping_str = self.block_device_mapping
-         mapping = []
+         mapping = {}
          mapping_pairs = mapping_str.split(',')
          for m in mapping_pairs:
              m_parts = m.split('=')
              if len(m_parts) > 1:
-                 mapping.append(m_parts[0])
-                 mapping.append(m_parts[1])
+                 mapping[m_parts[0]] = m_parts[1]
          return mapping
  
      def add_product_codes(self):
diff --combined euca2ools/commands/euca/bundlevol.py
index 32cb121,73cc07c..0696b49
--- a/euca2ools/commands/euca/bundlevol.py
+++ b/euca2ools/commands/euca/bundlevol.py
@@@ -98,7 -98,7 +98,7 @@@ class BundleVol(euca2ools.commands.euca
                 Param(name='target_architecture',
                       short_name='r', long_name='arch',
                       optional=True, ptype='string', default='x86_64',
 -                     choices=['i386', 'x86_64'],
 +                     choices=['i386', 'x86_64', 'armhf'],
                       doc='Target architecture for the image'),
                 Param(name='volume_path', long_name='volume',
                       optional=True, ptype='dir', default='/',
@@@ -175,7 -175,7 +175,7 @@@
                  ancestor_ami_ids)
  
  
-     def add_product_codes(self, product_code_string, product_codes):
+     def add_product_codes(self, product_code_string, product_codes=None):
          if not product_codes:
              product_codes = []
          product_code_values = product_code_string.split(',')
@@@ -245,7 -245,7 +245,7 @@@
               ancestor_ami_ids) = self.get_instance_metadata(self.ramdisk_id,
                                                              self.kernel_id,
                                                              self.block_device_mapping)
-         if self.product_codes:
+         if self.product_codes and isinstance(self.product_codes,basestring):
              self.product_codes = self.add_product_codes(self.product_codes)
  
          try:

-- 
managing cloud instances for Eucalyptus