Rev 5574: Turn the exception about dict option expansion into a warning. in file:///home/vila/src/bzr/experimental/config/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/experimental/config/

------------------------------------------------------------
revno: 5574
revision-id: v.ladeuil+lp at free.fr-20110218103336-83nx6nqk06ibgqky
parent: v.ladeuil+lp at free.fr-20110218102904-bb0akwfd2636kkb1
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: expand-options
timestamp: Fri 2011-02-18 11:33:36 +0100
message:
  Turn the exception about dict option expansion into a warning.
-------------- next part --------------
=== modified file 'bzrlib/config.py'
--- a/bzrlib/config.py	2011-02-17 18:04:59 +0000
+++ b/bzrlib/config.py	2011-02-18 10:33:36 +0000
@@ -327,7 +327,9 @@
             if isinstance(value, list):
                 value = self._interpolate_list(value)
             elif isinstance(value, dict):
-                raise ValueError('Dicts do not support interpolation')
+                trace.warning('Cannot expand "%s":'
+                              ' Dicts do not support option expansion'
+                              % (option_name,))
             else:
                 value = self._interpolate_string(value)
         return value