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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Nicolas Wavrant
slapos
Commits
c2438f6c
Commit
c2438f6c
authored
Jun 18, 2012
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'drupal'
Conflicts: slapos/recipe/request.py
parents
d1f6731d
8b7574b3
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
35 additions
and
32 deletions
+35
-32
slapos/recipe/request.py
slapos/recipe/request.py
+3
-3
stack/lamp/buildout.cfg
stack/lamp/buildout.cfg
+31
-28
stack/slapos.cfg
stack/slapos.cfg
+1
-1
No files found.
slapos/recipe/request.py
View file @
c2438f6c
...
@@ -95,9 +95,9 @@ class Recipe(object):
...
@@ -95,9 +95,9 @@ class Recipe(object):
status
=
'not ready yet, please try again'
status
=
'not ready yet, please try again'
except
AttributeError
:
except
AttributeError
:
status
=
'unknown'
status
=
'unknown'
error_message
=
'Connection parameter %s not found. '
error_message
=
'Connection parameter %s not found. '
\
'
Status of requested instance is : %s. If this error persists, '
'
Requested instance is currently %s. If this error persists, '
\
'check this instance.'
%
(
self
.
failed
,
status
)
'check
status of
this instance.'
%
(
self
.
failed
,
status
)
self
.
logger
.
error
(
error_message
)
self
.
logger
.
error
(
error_message
)
raise
KeyError
(
error_message
)
raise
KeyError
(
error_message
)
return
[]
return
[]
...
...
stack/lamp/buildout.cfg
View file @
c2438f6c
...
@@ -188,29 +188,28 @@ signature-certificate-list =
...
@@ -188,29 +188,28 @@ signature-certificate-list =
-----END CERTIFICATE-----
-----END CERTIFICATE-----
[versions]
[versions]
# Automatically picked by buildout-versions
Jinja2 = 2.6
Jinja2 = 2.6
Pygments = 1.5
Pygments = 1.5
Sphinx = 1.1.3
Werkzeug = 0.8.3
Werkzeug = 0.8.3
apache-libcloud = 0.
9
.1
apache-libcloud = 0.
10
.1
async = 0.6.1
async = 0.6.1
buildout-versions = 1.7
buildout-versions = 1.7
docutils = 0.9
docutils = 0.9
.1
gitdb = 0.5.4
gitdb = 0.5.4
hexagonit.recipe.cmmi = 1.5.0
hexagonit.recipe.cmmi = 1.5.1
ipython = 0.12.1
meld3 = 0.6.8
meld3 = 0.6.8
pycrypto = 2.
5
pycrypto = 2.
6
rdiff-backup = 1.0.5
rdiff-backup = 1.0.5
slapos.cookbook = 0.5
2
slapos.cookbook = 0.5
4.1
slapos.recipe.build = 0.
7
slapos.recipe.build = 0.
9
slapos.recipe.download = 1.0.dev-r4053
slapos.recipe.download = 1.0.dev-r4053
slapos.recipe.template = 2.
3
slapos.recipe.template = 2.
4
slapos.toolbox = 0.24
slapos.toolbox = 0.24
smmap = 0.8.2
smmap = 0.8.2
# Required by:
# Required by:
# slapos.core==0.2
4
# slapos.core==0.2
5
# slapos.toolbox==0.24
# slapos.toolbox==0.24
Flask = 0.8
Flask = 0.8
...
@@ -219,9 +218,13 @@ Flask = 0.8
...
@@ -219,9 +218,13 @@ Flask = 0.8
GitPython = 0.3.2.RC1
GitPython = 0.3.2.RC1
# Required by:
# Required by:
# slapos.cookbook==0.5
2
# slapos.cookbook==0.5
4.1
PyXML = 0.8.4
PyXML = 0.8.4
# Required by:
# netaddr==0.7.7
Sphinx = 1.1.3
# Required by:
# Required by:
# slapos.toolbox==0.24
# slapos.toolbox==0.24
atomize = 0.1.1
atomize = 0.1.1
...
@@ -231,57 +234,57 @@ atomize = 0.1.1
...
@@ -231,57 +234,57 @@ atomize = 0.1.1
feedparser = 5.1.2
feedparser = 5.1.2
# Required by:
# Required by:
# slapos.cookbook==0.5
2
# slapos.cookbook==0.5
4.1
inotifyx = 0.2.0
inotifyx = 0.2.0
# Required by:
# Required by:
# slapos.cookbook==0.5
2
# slapos.cookbook==0.5
4.1
# slapos.core==0.2
4
# slapos.core==0.2
5
# xml-marshaller==0.9.7
# xml-marshaller==0.9.7
lxml = 2.3.4
lxml = 2.3.4
# Required by:
# Required by:
# slapos.cookbook==0.5
2
# slapos.cookbook==0.5
4.1
netaddr = 0.7.
6
netaddr = 0.7.
7
# Required by:
# Required by:
# slapos.core==0.2
4
# slapos.core==0.2
5
netifaces = 0.8
netifaces = 0.8
# Required by:
# Required by:
# slapos.toolbox==0.24
# slapos.toolbox==0.24
paramiko = 1.7.7.
1
paramiko = 1.7.7.
2
# Required by:
# Required by:
# slapos.toolbox==0.24
# slapos.toolbox==0.24
psutil = 0.4.1
psutil = 0.4.1
# Required by:
# Required by:
# slapos.cookbook==0.5
2
# slapos.cookbook==0.5
4.1
# slapos.core==0.2
4
# slapos.core==0.2
5
# slapos.toolbox==0.24
# slapos.toolbox==0.24
# zc.buildout==1.6.0-dev-SlapOS-00
3
# zc.buildout==1.6.0-dev-SlapOS-00
6
# zc.recipe.egg==1.3.2
# zc.recipe.egg==1.3.2
setuptools = 0.6c12dev-r88846
setuptools = 0.6c12dev-r88846
# Required by:
# Required by:
# slapos.cookbook==0.5
2
# slapos.cookbook==0.5
4.1
# slapos.toolbox==0.24
# slapos.toolbox==0.24
slapos.core = 0.2
4
slapos.core = 0.2
5
# Required by:
# Required by:
# slapos.core==0.2
4
# slapos.core==0.2
5
supervisor = 3.0a12
supervisor = 3.0a12
# Required by:
# Required by:
# slapos.cookbook==0.5
2
# slapos.cookbook==0.5
4.1
# slapos.toolbox==0.24
# slapos.toolbox==0.24
xml-marshaller = 0.9.7
xml-marshaller = 0.9.7
# Required by:
# Required by:
# slapos.cookbook==0.5
2
# slapos.cookbook==0.5
4.1
zc.recipe.egg = 1.3.2
zc.recipe.egg = 1.3.2
# Required by:
# Required by:
# slapos.core==0.2
4
# slapos.core==0.2
5
zope.interface = 4.0.
0
zope.interface = 4.0.
1
stack/slapos.cfg
View file @
c2438f6c
...
@@ -58,4 +58,4 @@ eggs =
...
@@ -58,4 +58,4 @@ eggs =
# https://github.com/SlapOS/hexagonit.recipe.download
# https://github.com/SlapOS/hexagonit.recipe.download
hexagonit.recipe.download = 1.5.1-dev-slapos-001
hexagonit.recipe.download = 1.5.1-dev-slapos-001
# Use SlapOS patched zc.buildout
# Use SlapOS patched zc.buildout
zc.buildout = 1.6.0-dev-SlapOS-00
4
zc.buildout = 1.6.0-dev-SlapOS-00
6
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