Fix b8ba7fe6.

Obvious syntax error that viciously passed pylint.

Fix b8ba7fe6.
Obvious syntax error that viciously passed pylint.
192de42b · Cédric de Saint Martin · b8ba7fe6 · 192de42b
Commit 192de42b authored May 03, 2013 by Cédric de Saint Martin
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

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

No files found.
--- a/slapos/recipe/request.py
+++ b/slapos/recipe/request.py
@@ -131,7 +131,7 @@ class Recipe(object):
          options['instance-guid'] = self.instance.getInstanceGuid()
          # XXX: deprecated, to be removed
          options['instance_guid'] = self.instance.getInstanceGuid()
-        except slapmodule.ResourceNotReady, AttributeError:
+        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: