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

[Alexander Richter]

The following commit has been merged in the experimental branch:
commit 332fd3ca568cd2c3f5d4df13cceb09a3c9cf260e
Author: Alexander Richter <razrichter at gmail.com>
Date:   Thu Jun 28 16:37:47 2012 -0700

    Fixed bug: call signature for add_product_codes() does not match call structure

diff --git a/euca2ools/commands/euca/bundlevol.py b/euca2ools/commands/euca/bundlevol.py
index cfc1873..73cc07c 100644
--- a/euca2ools/commands/euca/bundlevol.py
+++ b/euca2ools/commands/euca/bundlevol.py
@@ -175,7 +175,7 @@ class BundleVol(euca2ools.commands.eucacommand.EucaCommand):
                 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 @@ 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:
+        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