- Fixed a bug that caused buildouts to fail when variable

  substitutions are used to name standard directories, as in::

[buildout]
    eggs-directory = ${buildout:directory}/develop-eggs


git-svn-id: http://svn.zope.org/repos/main/zc.buildout/trunk@88919 62d5b8a3-27da-0310-9561-8e5933582275

CHANGES.txt

@@ -4,8 +4,17 @@ Status
 Change History
 **************
 
-1.1 (2008-07-19)
-================
+1.1.1 (2008-07-28)
+==================
+
+- Fixed a bug that caused buildouts to fail when variable
+  substitutions are used to name standard directories, as in::
+
+    [buildout]
+    eggs-directory = ${buildout:directory}/develop-eggs
+
+1.1.0 (2008-07-19)
+==================
 
 - Added a buildout-level unzip option tp change the default policy for
   unzipping zip-safe eggs.

src/zc/buildout/buildout.py

@@ -128,8 +128,11 @@ class Buildout(UserDict.DictMixin):
         # used already (Gottfried Ganssauge)
         buildout_section = data.get('buildout')
             
-        # Try to make sure we have absolute paths for standard directories. We do this
-        # before doing substitutions, in case a one of these gets read by another section.
+        # Try to make sure we have absolute paths for standard
+        # directories. We do this before doing substitutions, in case
+        # a one of these gets read by another section.  If any
+        # variable references are used though, we leave it as is in
+        # _buildout_path.
         if 'directory' in buildout_section:
             self._buildout_dir = buildout_section['directory']
             for name in ('bin', 'parts', 'eggs', 'develop-eggs'):
@@ -255,8 +258,10 @@ class Buildout(UserDict.DictMixin):
 
         os.chdir(options['directory'])
 
-    def _buildout_path(self, *names):
-        return os.path.join(self._buildout_dir, *names)
+    def _buildout_path(self, name):
+        if '${' in name:
+            return name
+        return os.path.join(self._buildout_dir, name)
 
     def bootstrap(self, args):
         __doing__ = 'Bootstraping.'

src/zc/buildout/tests.py

@@ -2444,6 +2444,19 @@ def pyc_and_pyo_files_have_correct_paths():
 
     """
 
+def dont_mess_with_standard_dirs_with_variable_refs():
+    """
+    >>> write('buildout.cfg',
+    ... '''
+    ... [buildout]
+    ... eggs-directory = ${buildout:directory}/develop-eggs
+    ... parts = 
+    ... ''' % globals())
+    >>> print system(buildout),
+    
+    """
+
+
 ######################################################################
     
 def create_sample_eggs(test, executable=sys.executable):