← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/config.py

  • Committer: Vincent Ladeuil
  • Date: 2011-02-18 10:33:36 UTC
  • mto: This revision was merged to the branch mainline in revision 5684.
  • Revision ID: v.ladeuil+lp@free.fr-20110218103336-83nx6nqk06ibgqky
Turn the exception about dict option expansion into a warning.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/config.py
327
327
            if isinstance(value, list):
328
328
                value = self._interpolate_list(value)
329
329
            elif isinstance(value, dict):
330
 
                raise ValueError('Dicts do not support interpolation')
 
330
                trace.warning('Cannot expand "%s":'
 
331
                              ' Dicts do not support option expansion'
 
332
                              % (option_name,))
331
333
            else:
332
334
                value = self._interpolate_string(value)
333
335
        return value