From 5ae3b0ba7fefce71ea34f152aa0764288f22fffd Mon Sep 17 00:00:00 2001 From: Kazuhiko Shiozaki <kazuhiko@nexedi.com> Date: Wed, 5 Mar 2014 21:03:28 +0100 Subject: [PATCH] fixup! specify 'python = python2.7' in stack/slapos.cfg:[buildout] only. no need to specify 'python = ${buildout:python}' because it is the default behaviour. --- component/cloudooo/buildout.cfg | 1 - component/lxml-python/buildout.cfg | 1 - component/m2crypto/buildout.cfg | 1 - component/mysql-python/buildout.cfg | 1 - component/pil-python/buildout.cfg | 1 - component/pycrypto-python/buildout.cfg | 1 - component/pysvn-python/buildout.cfg | 1 - component/python-cffi/buildout.cfg | 1 - component/python-cryptography/buildout.cfg | 1 - component/python-ldap-python/buildout.cfg | 1 - component/rdiff-backup/buildout.cfg | 2 -- component/slapos/buildout.cfg | 2 -- software/erp5testnode/software.cfg | 1 - software/etherpad-lite/common.cfg | 1 - software/seleniumrunner/software.cfg | 2 -- software/silverstripe/software.cfg | 1 - software/trac-svn/software.cfg | 1 - software/varnish/software.cfg | 2 -- stack/erp5/buildout.cfg | 6 ------ stack/slapos.cfg | 1 - 20 files changed, 29 deletions(-) mode change 100755 => 100644 component/cloudooo/buildout.cfg diff --git a/component/cloudooo/buildout.cfg b/component/cloudooo/buildout.cfg old mode 100755 new mode 100644 index 724e3d692..f601aaec8 --- a/component/cloudooo/buildout.cfg +++ b/component/cloudooo/buildout.cfg @@ -22,7 +22,6 @@ git-executable = ${git:location}/bin/git [cloudooo] recipe = zc.recipe.egg -python = ${buildout:python} extra-paths = ${cloudooo-repository:location} eggs = ${lxml-python:egg} diff --git a/component/lxml-python/buildout.cfg b/component/lxml-python/buildout.cfg index 22e17f3f2..763fea556 100644 --- a/component/lxml-python/buildout.cfg +++ b/component/lxml-python/buildout.cfg @@ -12,7 +12,6 @@ PATH = ${libxslt:location}/bin:%(PATH)s [lxml-python] recipe = zc.recipe.egg:custom -python = ${buildout:python} egg = lxml rpath = diff --git a/component/m2crypto/buildout.cfg b/component/m2crypto/buildout.cfg index 7236e66f4..1895f618f 100644 --- a/component/m2crypto/buildout.cfg +++ b/component/m2crypto/buildout.cfg @@ -10,7 +10,6 @@ parts = [M2Crypto] recipe = zc.recipe.egg:custom -python = ${buildout:python} egg = M2Crypto environment = M2Crypto-env rpath = diff --git a/component/mysql-python/buildout.cfg b/component/mysql-python/buildout.cfg index ffe3bcfc0..65961c9ff 100644 --- a/component/mysql-python/buildout.cfg +++ b/component/mysql-python/buildout.cfg @@ -12,7 +12,6 @@ PATH =${mariadb:location}/bin:%(PATH)s [mysql-python] recipe = zc.recipe.egg:custom -python = ${buildout:python} egg = MySQL-python depends = ${mariadb:version} diff --git a/component/pil-python/buildout.cfg b/component/pil-python/buildout.cfg index c5255eb4d..95cca15b6 100644 --- a/component/pil-python/buildout.cfg +++ b/component/pil-python/buildout.cfg @@ -9,7 +9,6 @@ parts = [pil-python] recipe = zc.recipe.egg:custom -python = ${buildout:python} egg = PIL include-dirs = ${freetype:location}/include diff --git a/component/pycrypto-python/buildout.cfg b/component/pycrypto-python/buildout.cfg index 8ff4a9568..835f9c884 100644 --- a/component/pycrypto-python/buildout.cfg +++ b/component/pycrypto-python/buildout.cfg @@ -9,7 +9,6 @@ versions = versions [pycrypto-python] recipe = zc.recipe.egg:custom -python = ${buildout:python} egg = pycrypto include-dirs = ${gmp:location}/include diff --git a/component/pysvn-python/buildout.cfg b/component/pysvn-python/buildout.cfg index c1603f158..f128a6110 100644 --- a/component/pysvn-python/buildout.cfg +++ b/component/pysvn-python/buildout.cfg @@ -8,7 +8,6 @@ parts = [pysvn-python] recipe = zc.recipe.egg:custom -python = ${buildout:python} egg = pysvn include-dirs = diff --git a/component/python-cffi/buildout.cfg b/component/python-cffi/buildout.cfg index 85f73e43d..0662d9165 100644 --- a/component/python-cffi/buildout.cfg +++ b/component/python-cffi/buildout.cfg @@ -8,7 +8,6 @@ parts = [python-cffi] recipe = zc.recipe.egg:custom -python = ${buildout:python} egg = cffi environment = python-cffi-env library-dirs = diff --git a/component/python-cryptography/buildout.cfg b/component/python-cryptography/buildout.cfg index 24a65ace1..b1f8ca604 100644 --- a/component/python-cryptography/buildout.cfg +++ b/component/python-cryptography/buildout.cfg @@ -9,7 +9,6 @@ parts = [python-cryptography] recipe = zc.recipe.egg:custom -python = ${buildout:python} egg = cryptography environment = python-cryptography-env diff --git a/component/python-ldap-python/buildout.cfg b/component/python-ldap-python/buildout.cfg index 97e0281bf..048805311 100644 --- a/component/python-ldap-python/buildout.cfg +++ b/component/python-ldap-python/buildout.cfg @@ -8,7 +8,6 @@ extends = [python-ldap-python] recipe = zc.recipe.egg:custom -python = ${buildout:python} egg = python-ldap rpath = ${openldap:location}/lib diff --git a/component/rdiff-backup/buildout.cfg b/component/rdiff-backup/buildout.cfg index 603af3b02..ea4206417 100644 --- a/component/rdiff-backup/buildout.cfg +++ b/component/rdiff-backup/buildout.cfg @@ -7,7 +7,6 @@ parts = [rdiff-backup-build] recipe = zc.recipe.egg:custom -python = ${buildout:python} egg = rdiff-backup include-dirs = ${librsync:location}/include/ @@ -20,7 +19,6 @@ find-links = http://pkgs.fedoraproject.org/repo/pkgs/rdiff-backup/rdiff-backup-1 [rdiff-backup] # Scripts only generation part for rdiff-backup recipe = zc.recipe.egg -python = ${buildout:python} eggs = ${rdiff-backup-build:egg} entry-points = diff --git a/component/slapos/buildout.cfg b/component/slapos/buildout.cfg index 7bc6b1b77..8f5fb126c 100644 --- a/component/slapos/buildout.cfg +++ b/component/slapos/buildout.cfg @@ -91,7 +91,6 @@ output = ${buildout:directory}/environment.sh [slapos] recipe = z3c.recipe.scripts -python = ${buildout:python} eggs = ${python-cffi:egg} ${python-cryptography:egg} @@ -125,7 +124,6 @@ scripts = [py] recipe = zc.recipe.egg -python = ${buildout:python} eggs = ${slapos:eggs} interpreter = py diff --git a/software/erp5testnode/software.cfg b/software/erp5testnode/software.cfg index 744848a2a..a7e0219bd 100644 --- a/software/erp5testnode/software.cfg +++ b/software/erp5testnode/software.cfg @@ -64,7 +64,6 @@ scripts = slapgrid-sr = slapos.grid.slapgrid:runSoftwareRelease slapproxy = slapos.proxy:main -python = ${buildout:python} [template] recipe = slapos.recipe.template diff --git a/software/etherpad-lite/common.cfg b/software/etherpad-lite/common.cfg index 65b4ffaf3..bbca20299 100644 --- a/software/etherpad-lite/common.cfg +++ b/software/etherpad-lite/common.cfg @@ -39,7 +39,6 @@ module = etherpad-lite [instance-recipe-egg] recipe = zc.recipe.egg -python = ${buildout:python} eggs = ${instance-recipe:egg} [etherpad-lite-repository] diff --git a/software/seleniumrunner/software.cfg b/software/seleniumrunner/software.cfg index c1f2e3187..7b59d4a7a 100644 --- a/software/seleniumrunner/software.cfg +++ b/software/seleniumrunner/software.cfg @@ -29,12 +29,10 @@ module = seleniumrunner [instance-recipe-egg] recipe = zc.recipe.egg -python = ${buildout:python} eggs = ${instance-recipe:egg} [eggs] recipe = zc.recipe.egg -python = ${buildout:python} eggs = ${lxml-python:egg} diff --git a/software/silverstripe/software.cfg b/software/silverstripe/software.cfg index ce382bbe5..9aa731893 100644 --- a/software/silverstripe/software.cfg +++ b/software/silverstripe/software.cfg @@ -31,7 +31,6 @@ mode = 0644 [instance-recipe-egg] recipe = zc.recipe.egg -python = ${buildout:python} eggs = ${mysql-python:egg} ${instance-recipe:egg} diff --git a/software/trac-svn/software.cfg b/software/trac-svn/software.cfg index 6e697ac45..9c0b2a783 100644 --- a/software/trac-svn/software.cfg +++ b/software/trac-svn/software.cfg @@ -50,7 +50,6 @@ allow-hosts += [instance-egg] recipe = z3c.recipe.scripts -python = ${buildout:python} eggs = ${mysql-python:egg} slapos.toolbox diff --git a/software/varnish/software.cfg b/software/varnish/software.cfg index 770dac6a7..5784a1de3 100644 --- a/software/varnish/software.cfg +++ b/software/varnish/software.cfg @@ -92,7 +92,6 @@ mode = 640 [eggs] recipe = zc.recipe.egg -python = ${buildout:python} eggs = ${lxml-python:egg} erp5.util @@ -104,7 +103,6 @@ scripts = [slapos-toolbox] recipe = zc.recipe.egg -python = ${buildout:python} eggs = ${lxml-python:egg} slapos.toolbox diff --git a/stack/erp5/buildout.cfg b/stack/erp5/buildout.cfg index 0d180b350..cec0cee00 100644 --- a/stack/erp5/buildout.cfg +++ b/stack/erp5/buildout.cfg @@ -360,7 +360,6 @@ update-command = ${:command} # XXX: Workaround for fact ERP5Type is not an distribution and does not # expose entry point for test runner recipe = zc.recipe.egg -python = ${buildout:python} eggs = ${eggs:eggs} extra-paths = ${eggs:extra-paths} entry-points = @@ -398,7 +397,6 @@ initialization = # XXX: Workaround for fact ERP5Type is not an distribution and does not # expose entry point for test runner recipe = zc.recipe.egg -python = ${buildout:python} eggs = ${eggs:eggs} extra-paths = ${eggs:extra-paths} entry-points = @@ -417,7 +415,6 @@ initialization = [patched-eggs] recipe = minitage.recipe.egg -python = ${buildout:python} eggs = Acquisition Products.DCWorkflow @@ -434,7 +431,6 @@ ZODB3-patch-binary = ${patch:location}/bin/patch [eggs] recipe = zc.recipe.egg -python = ${buildout:python} eggs = ${mysql-python:egg} ${lxml-python:egg} @@ -539,7 +535,6 @@ extra-paths = [zodbanalyze] recipe = zc.recipe.egg -python = ${buildout:python} eggs = ZODB3 erp5.util @@ -553,7 +548,6 @@ revision = b91e43a3922160fe5f080eca45e0c51fe5345bcd [slapos-toolbox] recipe = zc.recipe.egg -python = ${buildout:python} eggs = ${lxml-python:egg} slapos.toolbox diff --git a/stack/slapos.cfg b/stack/slapos.cfg index 976f0b1c1..7c40164c9 100644 --- a/stack/slapos.cfg +++ b/stack/slapos.cfg @@ -64,7 +64,6 @@ networkcache-section = networkcache # if using "develop" [slapos-cookbook] recipe = zc.recipe.egg -python = ${buildout:python} eggs = ${lxml-python:egg} ${python-cffi:egg} -- 2.30.9