From 53f4321533d25f71457fe90ea433d8d9bac4ba43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20de=20Saint=20Martin?= <cedric.dsm@tiolive.com>
Date: Mon, 24 Sep 2012 09:59:25 +0200
Subject: [PATCH] Add exception thrown by slapproxy as well.

---
 slapos/recipe/request.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/slapos/recipe/request.py b/slapos/recipe/request.py
index f584c53ae..e871937c0 100644
--- a/slapos/recipe/request.py
+++ b/slapos/recipe/request.py
@@ -134,7 +134,7 @@ class Recipe(object):
       try:
         options['connection-%s' % param] = str(
           instance.getConnectionParameter(param))
-      except slapmodule.NotFoundError:
+      except (slapmodule.NotFoundError, slapmodule.ServerError):
         options['connection-%s' % param] = ''
         if self.failed is None:
           self.failed = param
@@ -144,7 +144,7 @@ class Recipe(object):
       # Check instance status to know if instance has been deployed
       try:
         status = self.instance.getState()
-      except slapmodule.NotFoundError:
+      except (slapmodule.NotFoundError, slapmodule.ServerError):
         status = 'not ready yet, please try again'
       except AttributeError:
         status = 'unknown'
-- 
2.30.9