Rev 6085: Fix the hook call. in file:///home/vila/src/bzr/experimental/expand-in-stack/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/experimental/expand-in-stack/

------------------------------------------------------------
revno: 6085
revision-id: v.ladeuil+lp at free.fr-20110822081626-yh68ae3vi3fvk7cz
parent: v.ladeuil+lp at free.fr-20110819171043-5v7qkicv102ae4zj
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: expand-in-stack
timestamp: Mon 2011-08-22 10:16:26 +0200
message:
  Fix the hook call.
-------------- next part --------------
=== modified file 'bzrlib/config.py'
--- a/bzrlib/config.py	2011-08-19 17:10:43 +0000
+++ b/bzrlib/config.py	2011-08-22 08:16:26 +0000
@@ -2947,8 +2947,6 @@
             # If the option is registered, it may provide a default value
             if opt is not None:
                 value = opt.get_default()
-        for hook in ConfigHooks['get']:
-            hook(self, name, value)
         if expand:
             if isinstance(value, list):
                 value = self._expand_options_in_list(value)
@@ -2958,6 +2956,8 @@
                               % (name,))
             elif isinstance(value, (str, unicode)):
                 value = self._expand_options_in_string(value)
+        for hook in ConfigHooks['get']:
+            hook(self, name, value)
         return value
 
     def expand_options(self, string, env=None):