Follow recent changes in SLAP lib: catch more exceptions

ef9dccd4 · Cédric de Saint Martin · fa45dff4 · ef9dccd4
Commit ef9dccd4 authored Nov 15, 2012 by Cédric de Saint Martin
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

slapos/recipe/request.py slapos/recipe/request.py +2 -2

No files found.
--- a/slapos/recipe/request.py
+++ b/slapos/recipe/request.py
@@ -131,7 +131,7 @@ class Recipe(object):
      try:
        options['connection-%s' % param] = str(
          instance.getConnectionParameter(param))
-      except (slapmodule.NotFoundError, slapmodule.ServerError):
+      except (slapmodule.NotFoundError, slapmodule.ServerError, slapmodule.ResourceNotReady):
        options['connection-%s' % param] = ''
        if self.failed is None:
          self.failed = param
@@ -144,7 +144,7 @@ class Recipe(object):
          status = self.instance.getState()
        else:
          status = 'not ready yet'
-      except (slapmodule.NotFoundError, slapmodule.ServerError):
+      except (slapmodule.NotFoundError, slapmodule.ServerError, slapmodule.ResourceNotReady):
        status = 'not ready yet'
      except AttributeError:
        status = 'unknown'