Merge branch 'slaprunner'

component/nodejs/buildout.cfg

@@ -3,7 +3,6 @@ extends =
   ../git/buildout.cfg
   ../pkgconfig/buildout.cfg
   ../openssl/buildout.cfg
-  ../python-2.7/buildout.cfg
   ../zlib/buildout.cfg
 
 parts =
@@ -12,14 +11,14 @@ parts =
 [nodejs]
 # Server-side Javascript.
 recipe = hexagonit.recipe.cmmi
-url = http://nodejs.org/dist/v0.6.19/node-v0.6.19.tar.gz
-md5sum = f5669a9717422b811c6bad1cc961b1e5
+url = http://nodejs.org/dist/v0.6.21/node-v0.6.21.tar.gz
+md5sum = 0da985a0bf820400af92363b9f453fe4
 configure-options =
   --openssl-includes=${openssl:location}/include
   --openssl-libpath=${openssl:location}/lib
 environment =
   HOME=${buildout:parts-directory}/${:_buildout_section_name_}
-  PATH=${pkgconfig:location}/bin:${python2.7:location}/bin:%(PATH)s
+  PATH=${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig/
   CPPFLAGS=-I${zlib:location}/include
   LDFLAGS=-Wl,-rpath=${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
@@ -32,7 +31,7 @@ configure-options =
   --openssl-includes=${openssl:location}/include
   --openssl-libpath=${openssl:location}/lib
 environment =
-  PATH=${pkgconfig:location}/bin:${python2.7:location}/bin:%(PATH)s
+  PATH=${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig/
   CPPFLAGS=-I${zlib:location}/include
   LDFLAGS=-Wl,-rpath=${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib

slapos/recipe/slaprunner/__init__.py

@@ -82,8 +82,9 @@ class Recipe(GenericBaseRecipe):
         PATH=os.path.dirname(self.options['git-binary']) + ':' + os.environ['PATH'],
         GIT_SSH=self.options['ssh_client']
     )
-
-    launch_args = [self.options['slaprunner'].strip(), config_file, '--debug']
+    launch_args = [self.options['slaprunner'].strip(), config_file]
+    if self.optionIsTrue('debug', default=False):
+      launch_args.append('--debug')
 
     wrapper = self.createPythonScript(self.options['wrapper'],
         'slapos.recipe.librecipe.execute.executee',

software/slaprunner/software.cfg

@@ -70,17 +70,17 @@ slapos.cookbook = 0.60
 slapos.libnetworkcache = 0.12
 slapos.recipe.build = 0.10.2
 slapos.recipe.template = 2.4.1
-slapos.toolbox = 0.28
+slapos.toolbox = 0.28.1
 smmap = 0.8.2
 z3c.recipe.scripts = 1.0.1
 
 # Required by:
 # slapos.core==0.27
-# slapos.toolbox==0.28
+# slapos.toolbox==0.28.1
 Flask = 0.9
 
 # Required by:
-# slapos.toolbox==0.28
+# slapos.toolbox==0.28.1
 GitPython = 0.3.2.RC1
 
 # Required by:
@@ -92,11 +92,11 @@ PyXML = 0.8.4
 Sphinx = 1.1.3
 
 # Required by:
-# slapos.toolbox==0.28
+# slapos.toolbox==0.28.1
 atomize = 0.1.1
 
 # Required by:
-# slapos.toolbox==0.28
+# slapos.toolbox==0.28.1
 feedparser = 5.1.2
 
 # Required by:
@@ -109,7 +109,7 @@ inotifyx = 0.2.0
 
 # Required by:
 # slapos.core==0.27
-# slapos.toolbox==0.28
+# slapos.toolbox==0.28.1
 # xml-marshaller==0.9.7
 lxml = 2.3.5
 
@@ -122,18 +122,18 @@ netaddr = 0.7.7
 netifaces = 0.8
 
 # Required by:
-# slapos.toolbox==0.28
+# slapos.toolbox==0.28.1
 paramiko = 1.7.7.2
 
 # Required by:
-# slapos.toolbox==0.28
+# slapos.toolbox==0.28.1
 psutil = 0.6.0
 
 # Required by:
 # slapos.cookbook==0.60
 # slapos.core==0.27
 # slapos.libnetworkcache==0.12
-# slapos.toolbox==0.28
+# slapos.toolbox==0.28.1
 # supervisor==3.0a12
 # zc.buildout==1.6.0-dev-SlapOS-006
 # zc.recipe.egg==1.3.2