Skip to content

slapos-caddy
slapos-caddy
Commit 192de42b authored by Cédric de Saint Martin's avatar Cédric de Saint Martin
Browse files
Options

Fix b8ba7fe6. 

Obvious syntax error that viciously passed pylint.
parent b8ba7fe6
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
slapos/recipe/request.py
View file @ 192de42b
...@@ -131,7 +131,7 @@ class Recipe(object): ...@@ -131,7 +131,7 @@ class Recipe(object):
options['instance-guid'] = self.instance.getInstanceGuid() options['instance-guid'] = self.instance.getInstanceGuid()
# XXX: deprecated, to be removed # XXX: deprecated, to be removed
options['instance_guid'] = self.instance.getInstanceGuid() 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. # Backward compatibility. Old SlapOS master and core don't know this.
self.logger.warning("Impossible to fetch instance GUID.") self.logger.warning("Impossible to fetch instance GUID.")
except (slapmodule.NotFoundError, slapmodule.ServerError, slapmodule.ResourceNotReady) as exc: except (slapmodule.NotFoundError, slapmodule.ServerError, slapmodule.ResourceNotReady) as exc:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7