Escape $$ character to $.

Do not escape when fetching dependency values.

src/zc/buildout/buildout.py

@@ -1146,6 +1146,7 @@ class Options(UserDict.DictMixin):
         self._raw = data
         self._cooked = {}
         self._data = {}
+        self._non_escaped_data = {}
 
     def _initialize(self):
         name = self.name
@@ -1207,11 +1208,17 @@ class Options(UserDict.DictMixin):
         v = '$$'.join([self._sub(s, seen) for s in v.split('$$')])
         self._cooked[option] = v
 
-    def get(self, option, default=None, seen=None):
-        try:
-            return self._data[option]
-        except KeyError:
-            pass
+    def get(self, option, default=None, seen=None, escaped=True):
+        if escaped:
+            try:
+                return self._data[option]
+            except KeyError:
+                pass
+        else:
+            try:
+                return self._non_escaped_data[option]
+            except KeyError:
+                pass
 
         v = self._cooked.get(option)
         if v is None:
@@ -1234,8 +1241,13 @@ class Options(UserDict.DictMixin):
             v = '$$'.join([self._sub(s, seen) for s in v.split('$$')])
             seen.pop()
 
+        self._non_escaped_data[option] = v
+        v = v.replace('$${', '${')
         self._data[option] = v
-        return v
+        if escaped:
+            return self._data[option]
+        else:
+            return self._non_escaped_data[option]
 
     _template_split = re.compile('([$]{[^}]*})').split
     _simple = re.compile('[-a-zA-Z0-9 ._]+$').match
@@ -1268,7 +1280,8 @@ class Options(UserDict.DictMixin):
             section, option = s
             if not section:
                 section = self.name
-            v = self.buildout[section].get(option, None, seen)
+            v = self.buildout[section].get(option, None, seen,
+                                           escaped=False)
             if v is None:
                 if option == '_buildout_section_name_':
                     v = self.name