upstream/oracle/pkg-gate: changeset 3516:e0023e528aa2

author	Mingrui Lyu <mingrui.lyu@oracle.com>
	Fri, 17 Feb 2017 14:30:06 -0800
changeset 3516	e0023e528aa2
parent 3515	3b174e841408
child 3521	e60d95c305b4

24560379 update-archive may not be called if memory exhaustion encountered

--- a/src/modules/client/bootenv.py	Wed Feb 15 22:24:16 2017 -0800
+++ b/src/modules/client/bootenv.py	Fri Feb 17 14:30:06 2017 -0800
@@ -179,9 +179,10 @@
                 self.be_clone = None
                 try:
                     self.beList = self.bemgr.list()
-                except Exception:
-                    # Unable to get the list of BEs
-                    raise RuntimeError("recoveryDisabled")
+                except BeMgmtOpError:
+                        # Unable to get the list of BEs
+                        if portable.osname == "sunos":
+                                raise RuntimeError("recoveryDisabled")
 
                 # Need to find the name of the BE we're operating on in order
                 # to create a snapshot and/or a clone of the BE.