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
Gabriel Monnerat
slapos
Commits
05ea7d61
Commit
05ea7d61
authored
Oct 02, 2012
by
Marco Mariani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use new buildout, do not call loads()
parent
8c8d9d16
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
6 deletions
+1
-6
slapos/recipe/postgres/__init__.py
slapos/recipe/postgres/__init__.py
+1
-6
No files found.
slapos/recipe/postgres/__init__.py
View file @
05ea7d61
...
@@ -34,8 +34,6 @@ from zc.buildout import UserError
...
@@ -34,8 +34,6 @@ from zc.buildout import UserError
from
slapos.recipe.librecipe
import
GenericBaseRecipe
from
slapos.recipe.librecipe
import
GenericBaseRecipe
# TODO: read ipv6 host without calling loads()
class
Recipe
(
GenericBaseRecipe
):
class
Recipe
(
GenericBaseRecipe
):
"""
\
"""
\
...
@@ -56,12 +54,9 @@ class Recipe(GenericBaseRecipe):
...
@@ -56,12 +54,9 @@ class Recipe(GenericBaseRecipe):
Returns a string represtation of ipv6_host.
Returns a string represtation of ipv6_host.
May receive a regular string, a set or a string serialized by buildout.
May receive a regular string, a set or a string serialized by buildout.
"""
"""
from
zc.buildout
import
buildout
ipv6_host
=
options
[
'ipv6_host'
]
ipv6_host
=
options
[
'ipv6_host'
]
if
ipv6_host
.
startswith
(
buildout
.
SERIALISED_VALUE_MAGIC
):
if
isinstance
(
ipv6_host
,
set
):
return
buildout
.
loads
(
ipv6_host
).
pop
()
elif
isinstance
(
ipv6_host
,
set
):
return
ipv6_host
.
pop
()
return
ipv6_host
.
pop
()
else
:
else
:
return
ipv6_host
return
ipv6_host
...
...
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