From 418c1f977b5734ef87339bc61b34256ed6f76a80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Nowak?= <luke@nexedi.com>
Date: Fri, 2 Sep 2011 15:29:24 +0200
Subject: [PATCH] Setup PATH on all tools.

---
 component/slapos/buildout.cfg | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/component/slapos/buildout.cfg b/component/slapos/buildout.cfg
index 38909d1f8..f0f664e28 100644
--- a/component/slapos/buildout.cfg
+++ b/component/slapos/buildout.cfg
@@ -24,7 +24,6 @@ parts =
   slapos
   cfg-environment
   sh-environment
-  slapos-slapgrid-sr
 
 find-links =
   http://www.nexedi.org/static/packages/source/slapos.buildout/
@@ -93,6 +92,10 @@ eggs =
   ${lxml-python:egg}
   slapos.core
 
+initialization =
+  import os
+  os.environ['PATH'] = os.path.expandvars('${environment:PATH}')
+
 # control scripts generation in order to avoid reinstalling bin/buildout
 scripts =
   generate-signature-key = slapos.signature:run
@@ -101,21 +104,11 @@ scripts =
   slapformat = slapos.format:main
   slapgrid = slapos.grid.slapgrid:run
   slapgrid-cp = slapos.grid.slapgrid:runComputerPartition
+  slapgrid-sr = slapos.grid.slapgrid:runSoftwareRelease
   slapgrid-ur = slapos.grid.slapgrid:runUsageReport
   slapgrid-supervisorctl = slapos.grid.svcbackend:supervisorctl
   slapgrid-supervisord = slapos.grid.svcbackend:supervisord
   slapproxy = slapos.proxy:main
 
-[slapos-slapgrid-sr]
-# install slapgrid-sr script with PATH generated by SlapOS
-recipe = ${slapos:recipe}
-python = ${slapos:python}
-eggs = ${slapos:eggs}
-initialization =
-  import os
-  os.environ['PATH'] = os.path.expandvars('${environment:PATH}')
-scripts =
-  slapgrid-sr = slapos.grid.slapgrid:runSoftwareRelease
-
 [versions]
 zc.buildout = 1.5.3-dev-SlapOS-009
-- 
2.30.9