Rev 6469: Values should never be converted during expansion. in file:///home/vila/src/bzr/bugs/930182-display-reg-options/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/930182-display-reg-options/

------------------------------------------------------------
revno: 6469
revision-id: v.ladeuil+lp at free.fr-20120217165243-21jmekje3m4xccry
parent: v.ladeuil+lp at free.fr-20120213171643-y4bug5p40os0u13o
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 930182-display-reg-options
timestamp: Fri 2012-02-17 17:52:43 +0100
message:
  Values should never be converted during expansion.
-------------- next part --------------
=== modified file 'bzrlib/config.py'
--- a/bzrlib/config.py	2012-02-13 17:16:43 +0000
+++ b/bzrlib/config.py	2012-02-17 16:52:43 +0000
@@ -3796,7 +3796,7 @@
             # anything else
             value = env[name]
         else:
-            value = self.get(name, expand=False)
+            value = self.get(name, expand=False, convert=False)
             value = self._expand_options_in_string(value, env, _refs)
         return value
 

=== modified file 'bzrlib/tests/test_config.py'
--- a/bzrlib/tests/test_config.py	2012-02-03 10:28:47 +0000
+++ b/bzrlib/tests/test_config.py	2012-02-17 16:52:43 +0000
@@ -3924,8 +3924,11 @@
 baz=end
 list={foo}
 ''')
-        self.registry.register(
-            config.ListOption('list'))
+        self.registry.register(config.ListOption('list'))
+        # Register an intermediate option as a list to ensure no conversion
+        # happen while expanding. Conversion should only occur for the origianl
+        # option ('list' here).
+        self.registry.register(config.ListOption('baz'))
         self.assertEquals(['start', 'middle', 'end'],
                            self.conf.get('list', expand=True))