Merge branch 'master' into kvm

component/lxml-python/buildout.cfg

@@ -13,9 +13,18 @@ PATH = ${libxslt:location}/bin:%(PATH)s
 [lxml-python]
 recipe = zc.recipe.egg:custom
 egg = lxml
+
+# Note: Workaround lxml.de issues blocking buildout runs
+# Empty index makes setuptools NOT trying to find any meta information about
+# lxml...
+index =
+# ...so it is wise to tell where lxml can be found
 find-links =
   http://pypi.python.org/pypi/lxml/2.2.8
   http://pypi.python.org/pypi/lxml/2.3
+# Note: Whenever someone is going to remove it, one shall check, that buildout
+# can run in newest mode, without any locally downloaded cache
+
 rpath =
   ${libxml2:location}/lib/
   ${libxslt:location}/lib/

software/slaprunner/software.cfg

@@ -31,6 +31,7 @@ md5sum = 04b17b8665eb4e11ce3a4661ad98e5e3
 [eggs]
 eggs +=
   slapos.toolbox
+  slapos.core
 
 [versions]
 slapos.cookbook = 0.10

stack/erp5.cfg

@@ -244,7 +244,7 @@ initialization =
   os.environ['SOFTWARE_HOME'] = os.path.abspath(os.path.dirname(os.path.dirname(Zope2.__file__)))
   os.environ['ZOPE_SCRIPTS'] = ''
   parts_directory = '''${buildout:parts-directory}'''
-  repository_id_list = '''${erp5_repository_list:repository_id_list}'''.split().reverse()
+  repository_id_list = list(reversed('''${erp5_repository_list:repository_id_list}'''.split()))
   temp_bt5_path_list = ['/'.join([parts_directory, x, 'bt5']) for x in repository_id_list]
   bt5_path_list = []
   [bt5_path_list.extend([bt5_path, '%s/*' % bt5_path]) for bt5_path in temp_bt5_path_list]
@@ -274,7 +274,8 @@ initialization =
   import Zope2
   os.environ['SOFTWARE_HOME'] = os.path.abspath(os.path.dirname(os.path.dirname(Zope2.__file__)))
   os.environ['ZOPE_SCRIPTS'] = ''
-  sys.path[0:0] = ['/'.join(['''${buildout:parts-directory}''', x]) for x in '''${erp5_repository_list:repository_id_list}'''.split()].reverse()
+  repository_id_list = list(reversed('''${erp5_repository_list:repository_id_list}'''.split()))
+  sys.path[0:0] = ['/'.join(['''${buildout:parts-directory}''', x]) for x in repository_id_list]
 
 [instance-recipe-egg]
 recipe = zc.recipe.egg