Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
22854239 Nova not expecting anything but a RAD error in call to getArchive()
authorBrian Reitz <Brian.Reitz@Oracle.COM>
Wed, 02 Mar 2016 12:23:26 -0800
changeset 5541 e93ae190039c
parent 5540 bfcdc34c39a9
child 5544 16204c8a93ff
22854239 Nova not expecting anything but a RAD error in call to getArchive()
components/openstack/nova/files/solariszones/driver.py file | annotate | diff | comparison | revisions 
--- a/components/openstack/nova/files/solariszones/driver.py	Wed Mar 02 16:57:57 2016 -0800
+++ b/components/openstack/nova/files/solariszones/driver.py	Wed Mar 02 12:23:26 2016 -0800
@@ -980,7 +980,10 @@
         try:
             ua = self._archive_manager.getArchive(image)
         except Exception as ex:
-            reason = ex.get_payload().info
+            if isinstance(ex, rad.client.ObjectError):
+                reason = ex.get_payload().info
+            else:
+                reason = str(ex)
             raise exception.ImageUnacceptable(
                 image_id=instance['image_ref'],
                 reason=reason)
upstream/oracle/userland-gate