fixed version pinning, use specific commit for the cookbook

software/maarch/software.cfg

@@ -13,8 +13,31 @@ parts +=
   instance
   instance-apache-php
   slapos-recipe-maarch-egg
+  slapos.cookbook-repository
+  check-recipe
 
 
+develop =
+  ${:parts-directory}/slapos.cookbook-repository
+
+
+extensions = buildout-versions
+
+
+[slapos.cookbook-repository]
+recipe = slapos.recipe.build:gitclone
+repository = http://git.erp5.org/repos/slapos.git
+revision = e6cce9da68214cf43aaa5419731d8d2bc59eb426
+git-executable = ${git:location}/bin/git
+
+
+[check-recipe]
+recipe = plone.recipe.command
+stop-on-error = true
+update-command = ${:command}
+command =
+  grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link
+
 
 #----------------
 #--

stack/lapp/buildout.cfg

@@ -311,100 +311,115 @@ signature-certificate-list =
 [versions]
 Jinja2 = 2.6
 Werkzeug = 0.8.3
-apache-libcloud = 0.11.4
+apache-libcloud = 0.12.1
 async = 0.6.1
 buildout-versions = 1.7
+cp.recipe.cmd = 0.4
 gitdb = 0.5.4
 hexagonit.recipe.cmmi = 1.6
-inotifyx = 0.2.0
-lxml = 3.0.2
 meld3 = 0.6.10
-netaddr = 0.7.10
-psycopg2 = 2.4.6
+plone.recipe.command = 1.1
 pycrypto = 2.6
-pytz = 2012h
 rdiff-backup = 1.0.5
-slapos.cookbook = 0.72.0
+slapos.recipe.build = 0.11.6
 slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.4.2
+slapos.toolbox = 0.33.1
 smmap = 0.8.2
 
 # Required by:
-# slapos.core==0.33.2-dev
-# slapos.toolbox==0.32.1-dev
+# slapos.core==0.35.1
+# slapos.toolbox==0.33.1
 Flask = 0.9
 
 # Required by:
-# slapos.toolbox==0.32.1-dev
+# slapos.toolbox==0.33.1
 GitPython = 0.3.2.RC1
 
 # Required by:
-# slapos.toolbox==0.32.1-dev
+# slapos.toolbox==0.33.1
 atomize = 0.1.1
 
 # Required by:
-# slapos.toolbox==0.32.1-dev
+# slapos.toolbox==0.33.1
 feedparser = 5.1.3
 
 # Required by:
-# hexagonit.recipe.cmmi==1.6
-hexagonit.recipe.download = 1.6nxd002
+# slapos.cookbook==0.74.1-dev
+inotifyx = 0.2.0
 
 # Required by:
-# slapos.core==0.33.2-dev
+# slapos.cookbook==0.74.1-dev
+# slapos.core==0.35.1
+# xml-marshaller==0.9.7
+lxml = 3.1.0
+
+# Required by:
+# slapos.cookbook==0.74.1-dev
+netaddr = 0.7.10
+
+# Required by:
+# slapos.core==0.35.1
 netifaces = 0.8
 
 # Required by:
-# slapos.toolbox==0.32.1-dev
-paramiko = 1.9.0
+# slapos.toolbox==0.33.1
+paramiko = 1.10.0
 
 # Required by:
-# slapos.toolbox==0.32.1-dev
+# slapos.toolbox==0.33.1
 psutil = 0.6.1
 
 # Required by:
-# slapos.core==0.33.2-dev
-pyflakes = 0.5.0
+# slapos.recipe.maarch==0.4
+psycopg2 = 2.4.6
 
 # Required by:
-# slapos.cookbook==0.70.1-dev
-# slapos.core==0.33.2-dev
-# slapos.toolbox==0.32.1-dev
+# slapos.core==0.35.1
+pyflakes = 0.6.1
+
+# Required by:
+# slapos.cookbook==0.74.1-dev
+pytz = 2013b
+
+# Required by:
+# slapos.cookbook==0.74.1-dev
+# slapos.core==0.35.1
+# slapos.recipe.maarch==0.4
+# slapos.toolbox==0.33.1
 # supervisor==3.0b1
 # zc.buildout==1.6.0-dev-SlapOS-010
-# zope.interface==4.0.2
+# zope.interface==4.0.5
 setuptools = 0.6c12dev-r88846
 
 # Required by:
-# slapos.core==0.33.2-dev
-supervisor = 3.0b1
+# slapos.cookbook==0.74.1-dev
+# slapos.toolbox==0.33.1
+slapos.core = 0.35.1
 
 # Required by:
-# slapos.toolbox==0.32.1-dev
-xml-marshaller = 0.9.7
+# slapos.core==0.35.1
+supervisor = 3.0b1
 
 # Required by:
-# slapos.core==0.33.2-dev
-zope.interface = 4.0.2
-
-cp.recipe.cmd = 0.4
-plone.recipe.command = 1.1
-slapos.recipe.build = 0.11.5
-slapos.toolbox = 0.33
+# slapos.core==0.35.1
+unittest2 = 0.5.1
 
 # Required by:
-# slapos.toolbox==0.33
-slapos.core = 0.35
+# slapos.cookbook==0.74.1-dev
+# slapos.toolbox==0.33.1
+xml-marshaller = 0.9.7
 
 # Required by:
-# slapos.core==0.35
-unittest2 = 0.5.1
+# zope.testing==4.1.2
+zope.exceptions = 4.0.6
 
 # Required by:
-# zope.testing==4.1.1
-zope.exceptions = 4.0.5
+# slapos.core==0.35.1
+# zope.testing==4.1.2
+zope.interface = 4.0.5
 
 # Required by:
 # cp.recipe.cmd==0.4
-zope.testing = 4.1.1
+zope.testing = 4.1.2