Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
103
Merge Requests
103
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos
Commits
f3b5f2cb
Commit
f3b5f2cb
authored
May 03, 2013
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Backward compatiblity about getInstanceGuid().
(cherry picked from commit ae9f790de75373fbe2d18e2cbd28a1a02c62ad71)
parent
bb6746ed
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
slapos/recipe/request.py
slapos/recipe/request.py
+2
-2
No files found.
slapos/recipe/request.py
View file @
f3b5f2cb
...
...
@@ -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 master
s
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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment