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
Valentin Benozillo
slapos
Commits
33c54add
Commit
33c54add
authored
Nov 21, 2012
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'softwaretype_raise'
parents
721b8459
9b09012e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
3 deletions
+5
-3
slapos/recipe/softwaretype.py
slapos/recipe/softwaretype.py
+5
-3
No files found.
slapos/recipe/softwaretype.py
View file @
33c54add
...
@@ -90,12 +90,14 @@ class Recipe:
...
@@ -90,12 +90,14 @@ class Recipe:
self
.
logger
.
info
(
'Deploying instance with software type %s'
%
\
self
.
logger
.
info
(
'Deploying instance with software type %s'
%
\
software_type
)
software_type
)
# Raise if request software_type does not exist ...
if
software_type
not
in
self
.
options
:
if
software_type
not
in
self
.
options
:
if
'default'
in
self
.
options
:
# ... Except for backward compatibility. Then use "default".
if
software_type
in
[
'RootSoftwareType'
]:
software_type
=
'default'
software_type
=
'default'
else
:
else
:
raise
zc
.
buildout
.
UserError
(
"This software type
isn't mapped. And "
raise
zc
.
buildout
.
UserError
(
"This software type
(%s) isn't mapped."
%
\
"there's no default software type."
)
software_type
)
instance_file_path
=
self
.
options
[
software_type
]
instance_file_path
=
self
.
options
[
software_type
]
...
...
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