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
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jean-Paul Smets
slapos
Commits
192de42b
Commit
192de42b
authored
May 03, 2013
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix
b8ba7fe6
.
Obvious syntax error that viciously passed pylint.
parent
b8ba7fe6
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
slapos/recipe/request.py
slapos/recipe/request.py
+1
-1
No files found.
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
:
...
...
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