Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kristopher Ruzic
slapos
Commits
192de42b
Commit
192de42b
authored
11 years ago
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
master
1.0
arnau
asterisk
cedric.ln-erp5-cluster
cloudooo-clusterise
cloudooo-clusterise-split
cygwin-res-resstack
davstorage-ajaxplorer
dream
eos
erp5
erp5-cluster
erp5-cluster-1.0
erp5-cluster-fix-zeo-resilient
erp5-cluster-haproxy-sticky-cookie
erp5-cluster-resilient
erp5-cluster-scalability
erp5-cluster-z2.13
erp5-cluster-z2.13-scalability
erp5-cluster-z2.13-scalability-N
erp5-component
erp5-component-z2.12
erp5-mysql-insecure-password
erp5-postfix
erp5-release
erp5-rkm
erp5-scikit
erp5-z2.12
erp5tesnode
etherpad-lite
frontend-monitor-slave-configuration
gcc-4.7
glpi
grid-computing
hexaglobe-watermarking-replicated
html5-dev-sr
improved-hello-world
inkscape-test
instance-state
ipython
ivan
klaus-ebusiness-lotse
kvm-cluster
kvm-iaas
kvm-packer-merge
manual-kvm
monitor
new-frontend
nginx-push-stream
officejs_testrunner
openstack
palo
postgres
powerdns
reafs/heads/ipython
recipe-test
request-recipe
scikit-notmerge
sitemon
slapos
slapos-master-cluster
slaprunner
slaprunner-paas
systematic
systematic-nginx
tristan-erp5-cluster
tristan-tmp
varnish
webrunner.custom-personal
zerovm-test
zimbra
1.0.3
vifib-20150203
vifib-20150130
vifib-20150123
vifib-20150116
vifib-20141222
slaprunner-resilient-v1
slaprunner-resilient-v1-RC1
slapos.core-1.0.0rc6-1
slapos.cookbook-0.102
slapos.cookbook-0.100
slapos.cookbook-0.99
slapos.cookbook-0.98
slapos.cookbook-0.97
slapos.cookbook-0.96
slapos.cookbook-0.95
slapos.cookbook-0.94
slapos.cookbook-0.93
slapos.cookbook-0.92
slapos.cookbook-0.91
slapos.cookbook-0.90
slapos.cookbook-0.89
slapos.cookbook-0.88
slapos.cookbook-0.87
slapos.cookbook-0.86
slapos.cookbook-0.85
slapos.cookbook-0.84.2
slapos.cookbook-0.84.1
slapos.cookbook-0.84
slapos.cookbook-0.83.1
slapos.cookbook-0.83
slapos.cookbook-0.82
slapos.cookbook-0.81
slapos.cookbook-0.80
slapos.cookbook-0.79
slapos.cookbook-0.78.5
slapos.cookbook-0.78.4
slapos.cookbook-0.78.3
slapos.cookbook-0.78.2
slapos.cookbook-0.78.1
slapos-legacy-flask-stack
slapos-0.270
slapos-0.263
slapos-0.262
slapos-0.261
slapos-0.260
slapos-0.259.2
slapos-0.259.1
slapos-0.259
slapos-0.258
slapos-0.257
slapos-0.256
slapos-0.255
slapos-0.254
slapos-0.253.3
slapos-0.253.2
slapos-0.253.1
slapos-0.253
slapos-0.252.1
slapos-0.252
slapos-0.251
slapos-0.250.1
slapos-0.250
slapos-0.249.1
slapos-0.249
slapos-0.248.1
slapos-0.248
slapos-0.247
slapos-0.246
slapos-0.245
slapos-0.244
slapos-0.243
slapos-0.242
slapos-0.241
slapos-0.240.0
slapos-0.240
slapos-0.239
slapos-0.238
slapos-0.237
slapos-0.236
slapos-0.235
slapos-0.234
slapos-0.233
slapos-0.232
slapos-0.231
slapos-0.230
slapos-0.229
slapos-0.228
slapos-0.227
slapos-0.226
slapos-0.225
slapos-0.224
slapos-0.223.1
slapos-0.223
slapos-0.222
slapos-0.221
slapos-0.220
slapos-0.219
slapos-0.218.2
slapos-0.218.1
slapos-0.218
slapos-0.217
slapos-0.217-B1
slapos-0.216
slapos-0.215
slapos-0.214
slapos-0.213
slapos-0.212
slapos-0.211
slapos-0.210
slapos-0.209
slapos-0.208
slapos-0.207
slapos-0.206
slapos-0.205
slapos-0.204
slapos-0.203
slapos-0.202
slapos-0.201
slapos-0.200
slapos-0.199
slapos-0.199-hotfix-20140409
slapos-0.198
slapos-0.197
slapos-0.196
slapos-0.195
slapos-0.194-RC3
slapos-0.194-RC2
slapos-0.194-RC1
slapos-0.193
slapos-0.192
slapos-0.191
slapos-0.190
slapos-0.189
slapos-0.188
slapos-0.187
slapos-0.186
slapos-0.185
slapos-0.184
slapos-0.183
slapos-0.182
slapos-0.181
slapos-0.180
slapos-0.179
slapos-0.178
slapos-0.177.5
slapos-0.177.4
slapos-0.177.3
slapos-0.177.2
slapos-0.177.1
slapos-0.177
slapos-0.176.4
slapos-0.176.3
slapos-0.176.2
slapos-0.176.1
slapos-0.176
slapos-0.175
slapos-0.174
slapos-0.173
slapos-0.172
slapos-0.171
slapos-0.170
slapos-0.169
slapos-0.168.9
slapos-0.168.8
slapos-0.168.7
slapos-0.168.6
slapos-0.168.5
slapos-0.168.4
slapos-0.168.3
slapos-0.168.2
slapos-0.168.1
slapos-0.168
slapos-0.165
slapos-0.164
slapos-0.163
erp5-cluster-1.0.1
cygwin-resstack-3
cygwin-resstack-2
cygwin-resstack-1
cygwin-cachetest-4
cygwin-cachetest-3
cygwin-cachetest-2
cygwin-cachetest-1
No related merge requests found
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):
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
:
...
...
This diff is collapsed.
Click to expand it.
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