Rev 6163: Fix overrides acquisition and check. in file:///home/vila/src/bzr/bugs/491196-cmdline-options/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/491196-cmdline-options/

------------------------------------------------------------
revno: 6163
revision-id: v.ladeuil+lp at free.fr-20110927094922-0cq0znfe8onlir81
parent: v.ladeuil+lp at free.fr-20110926154002-exguk3psfpc4b2uw
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 491196-cmdline-options
timestamp: Tue 2011-09-27 11:49:22 +0200
message:
  Fix overrides acquisition and check.
-------------- next part --------------
=== modified file 'bzrlib/commands.py'
--- a/bzrlib/commands.py	2011-09-26 15:40:02 +0000
+++ b/bzrlib/commands.py	2011-09-27 09:49:22 +0000
@@ -663,12 +663,14 @@
             opts['quiet'] = trace.is_quiet()
         elif opts.has_key('quiet'):
             del opts['quiet']
+        overrides = None
         try:
-            bzrlib.global_state.cmdline_overrides._from_cmdline(
-                opts.pop('override_config'))
+            overrides = opts.pop('override_config')
         except KeyError:
             # No overrides were specified
             pass
+        if overrides:
+            bzrlib.global_state.cmdline_overrides._from_cmdline(overrides)
 
         # mix arguments and options into one dictionary
         cmdargs = _match_argform(self.name(), self.takes_args, args)

=== modified file 'bzrlib/config.py'
--- a/bzrlib/config.py	2011-09-26 15:40:02 +0000
+++ b/bzrlib/config.py	2011-09-27 09:49:22 +0000
@@ -2659,7 +2659,8 @@
                 name, value = over.split('=', 1)
             except ValueError:
                 raise errors.BzrCommandError(
-                    gettext("Invalid '%s', should be of the form 'name=value'"))
+                    gettext("Invalid '%s', should be of the form 'name=value'")
+                    % (over,))
             self.set(name, value)