Backward compatiblity about getInstanceGuid().

(cherry picked from commit ae9f790de75373fbe2d18e2cbd28a1a02c62ad71)

Backward compatiblity about getInstanceGuid().
(cherry picked from commit ae9f790de75373fbe2d18e2cbd28a1a02c62ad71)
f3b5f2cb · Cédric de Saint Martin · bb6746ed · f3b5f2cb
Commit f3b5f2cb authored May 03, 2013 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,8 +131,8 @@ class Recipe(object):
          options['instance-guid'] = self.instance.getInstanceGuid()
          # XXX: deprecated, to be removed
          options['instance_guid'] = self.instance.getInstanceGuid()
-        except slapmodule.ResourceNotReady:
+        except slapmodule.ResourceNotReady, AttributeError:
-          # Backward compatibility. Old SlapOS masters don't know this.
+          # Backward compatibility. Old SlapOS master and core don't know this.
          self.logger.warning("Impossible to fetch instance GUID.")
    except (slapmodule.NotFoundError, slapmodule.ServerError, slapmodule.ResourceNotReady) as exc:
      self._raise_request_exception = exc