[Checkins] SVN: grokproject/trunk/ Actually added the required eggbasket section to the generated

[Maurits van Rees]

Log message for revision 87874:
  Actually added the required eggbasket section to the generated
  buildout.cfg.  Fixes https://bugs.launchpad.net/grok/+bug/242368
  

Changed:
  U   grokproject/trunk/CHANGES.txt
  U   grokproject/trunk/grokproject/template/buildout.cfg_tmpl
  U   grokproject/trunk/grokproject/templates.py

-=-
Modified: grokproject/trunk/CHANGES.txt
===================================================================
--- grokproject/trunk/CHANGES.txt	2008-07-01 08:49:42 UTC (rev 87873)
+++ grokproject/trunk/CHANGES.txt	2008-07-01 09:45:50 UTC (rev 87874)
@@ -4,6 +4,9 @@
 0.8 (unreleased)
 ------------------
 
+* Actually added the required eggbasket section to the generated
+  buildout.cfg.  Fixes https://bugs.launchpad.net/grok/+bug/242368
+
 * Catch download error when trying to get the big grok tarball.
 
 * Add a line at the end of bootstrap.py again to install the eggbasket

Modified: grokproject/trunk/grokproject/template/buildout.cfg_tmpl
===================================================================
--- grokproject/trunk/grokproject/template/buildout.cfg_tmpl	2008-07-01 08:49:42 UTC (rev 87873)
+++ grokproject/trunk/grokproject/template/buildout.cfg_tmpl	2008-07-01 09:45:50 UTC (rev 87874)
@@ -1,6 +1,6 @@
 [buildout]
 develop = .
-parts = app data zopectl i18n test
+parts = eggbasket app data zopectl i18n test
 newest = ${newest}
 extends = versions.cfg
 # eggs will be installed in the default buildout location
@@ -66,3 +66,8 @@
 domain = ${package}
 location = src/${package}
 output = locales
+
+[eggbasket]
+recipe = z3c.recipe.eggbasket
+eggs = grok
+url = http://grok.zope.org/releaseinfo/grok-eggs-${grokversion}.tgz

Modified: grokproject/trunk/grokproject/templates.py
===================================================================
--- grokproject/trunk/grokproject/templates.py	2008-07-01 08:49:42 UTC (rev 87873)
+++ grokproject/trunk/grokproject/templates.py	2008-07-01 09:45:50 UTC (rev 87874)
@@ -75,6 +75,10 @@
         version_info_file_contents = urllib.urlopen(version_info_url).read()
         vars['version_info_file_contents'] = version_info_file_contents
 
+        # Which grok version are we depending on?
+        version = required_grok_version(vars['version_info_file_contents'])
+        vars['grokversion'] = version
+
         buildout_default = exist_buildout_default_file()
         if explicit_eggs_dir:
             # Put explicit_eggs_dir in the vars; used by the post command.