From b8ba7fe62e3e5857ff1f530a5f06f58dbbf9af3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20de=20Saint=20Martin?= <cedric.dsm@tiolive.com>
Date: Fri, 3 May 2013 14:57:11 +0200
Subject: [PATCH] Backward compatiblity about getInstanceGuid().

---
 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 82316ce57..d33647145 100644
--- 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:
-          # Backward compatibility. Old SlapOS masters don't know this.
+        except slapmodule.ResourceNotReady, AttributeError:
+          # 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
-- 
2.30.9