Rev 6561: (vila) Fix obscure and misleading warning when trying to delete an unknown in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

[Patch Queue Manager]

At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 6561 [merge]
revision-id: pqm at pqm.ubuntu.com-20120917111425-4i6r0ze0v9zm33bu
parent: pqm at pqm.ubuntu.com-20120917093830-1o8asgkr9jd62yyd
parent: v.ladeuil+lp at free.fr-20120917084519-tu3lwvj3wukyo728
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2012-09-17 11:14:25 +0000
message:
  (vila) Fix obscure and misleading warning when trying to delete an unknown
   config option. (Vincent Ladeuil)
modified:
  bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
=== modified file 'bzrlib/config.py'
--- a/bzrlib/config.py	2012-08-23 13:58:07 +0000
+++ b/bzrlib/config.py	2012-09-17 08:45:19 +0000
@@ -2944,7 +2944,7 @@
         self.options[name] = value
 
     def remove(self, name):
-        if name not in self.orig:
+        if name not in self.orig and name in self.options:
             self.orig[name] = self.get(name, None)
         del self.options[name]