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

Garrett Holmstrom gholms at fedoraproject.org
Sun Jun 16 02:30:12 UTC 2013


The following commit has been merged in the master branch:
commit 5f1cff174bcfe7c14b32bdb3c96d623c0b711409
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Mon Feb 18 21:48:01 2013 -0800

    Make AWSError parsing a little more flexible

diff --git a/euca2ools/exceptions.py b/euca2ools/exceptions.py
index a3c8ddd..5a44ecf 100644
--- a/euca2ools/exceptions.py
+++ b/euca2ools/exceptions.py
@@ -148,6 +148,8 @@ class AWSError(requestbuilder.exceptions.ServerError):
             try:
                 parsed = parse_aws_xml(io.StringIO(six.text_type(self.body)))
                 parsed = parsed[parsed.keys()[0]]  # Strip off the root element
+                if 'Error' in parsed:
+                    parsed = parsed['Error']
                 self.code     = parsed.get('Code')
                 self.message  = parsed.get('Message')
                 self.elements = parsed

-- 
managing cloud instances for Eucalyptus



More information about the pkg-eucalyptus-commits mailing list