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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Nirina Malard
slapos
Commits
dd93f3f9
Commit
dd93f3f9
authored
Nov 08, 2011
by
Antoine Catton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Whitespace cleaning on softwaretype recipe
parent
c74767a0
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
slapos/recipe/softwaretype.py
slapos/recipe/softwaretype.py
+4
-4
No files found.
slapos/recipe/softwaretype.py
View file @
dd93f3f9
...
@@ -82,13 +82,13 @@ class Recipe:
...
@@ -82,13 +82,13 @@ class Recipe:
if
'default'
in
self
.
options
:
if
'default'
in
self
.
options
:
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 isn't mapped. And
"
"there's no default software type."
)
"there's no default software type."
)
instance_file_path
=
self
.
options
[
software_type
]
instance_file_path
=
self
.
options
[
software_type
]
if
not
os
.
path
.
exists
(
instance_file_path
):
if
not
os
.
path
.
exists
(
instance_file_path
):
raise
zc
.
buildout
.
UserError
(
"The specified buildout config file does not"
raise
zc
.
buildout
.
UserError
(
"The specified buildout config file does not
"
"exist."
)
"exist."
)
buildout
=
ConfigParser
()
buildout
=
ConfigParser
()
...
@@ -103,9 +103,9 @@ class Recipe:
...
@@ -103,9 +103,9 @@ class Recipe:
buildout
.
set
(
'slap-parameter'
,
parameter
,
value
)
buildout
.
set
(
'slap-parameter'
,
parameter
,
value
)
buildout
.
add_section
(
'slap-network-information'
)
buildout
.
add_section
(
'slap-network-information'
)
buildout
.
set
(
'slap-network-information'
,
'local-ipv4'
,
buildout
.
set
(
'slap-network-information'
,
'local-ipv4'
,
self
.
getLocalIPv4Address
())
self
.
getLocalIPv4Address
())
buildout
.
set
(
'slap-network-information'
,
'global-ipv6'
,
buildout
.
set
(
'slap-network-information'
,
'global-ipv6'
,
self
.
getGlobalIPv6Address
())
self
.
getGlobalIPv6Address
())
# Copy/paste slap_connection
# Copy/paste slap_connection
...
...
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