[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 eb53794871efda29c96382cb262d97dc1af0a920
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Mon Mar 18 18:26:40 2013 -0700

    Work around a CLC output bug
    
    Works around the issue discovered in TOOLS-283

diff --git a/euca2ools/commands/euca/__init__.py b/euca2ools/commands/euca/__init__.py
index 09db27c..562d839 100644
--- a/euca2ools/commands/euca/__init__.py
+++ b/euca2ools/commands/euca/__init__.py
@@ -218,7 +218,8 @@ class EucalyptusRequest(requestbuilder.request.AWSQueryRequest,
     def print_reservation(self, reservation):
         res_line = ['RESERVATION', reservation['reservationId'],
                     reservation.get('ownerId')]
-        group_ids = [group.get('groupId') or group.get('groupName')
+        # group.get('entry') is a workaround for a CLC bug
+        group_ids = [group.get('groupId') or group.get('entry') or ''
                      for group in reservation['groupSet']]
         res_line.append(', '.join(group_ids))
         print self.tabify(res_line)

-- 
managing cloud instances for Eucalyptus