BIND 10 master, updated. 723a57edeb33afe206a8e350cfc583d5cb451051 [master] update changelog

[BIND 10 source code commits]

The branch, master has been updated
       via  723a57edeb33afe206a8e350cfc583d5cb451051 (commit)
       via  25c802dd1c30580b94345e83eeb6a168ab329a33 (commit)
       via  8b52836ccac5c331b30812c608d52aa7fc538de5 (commit)
      from  2182b30eb6b833fe4c902d635aa97ad901518904 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 723a57edeb33afe206a8e350cfc583d5cb451051
Author: Jelte Jansen <jelte at isc.org>
Date:   Wed Nov 2 09:45:41 2011 +0100

    [master] update changelog

commit 25c802dd1c30580b94345e83eeb6a168ab329a33
Merge: 2182b30eb6b833fe4c902d635aa97ad901518904 8b52836ccac5c331b30812c608d52aa7fc538de5
Author: Jelte Jansen <jelte at isc.org>
Date:   Wed Nov 2 09:26:38 2011 +0100

    Merge branch 'trac1343'

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                                         |    6 ++++++
 src/lib/python/isc/config/ccsession.py            |    1 +
 src/lib/python/isc/config/tests/ccsession_test.py |   11 +++++++++++
 3 files changed, 18 insertions(+), 0 deletions(-)

-----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index 52c1ad2..ede474a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+309.	[bug]		jelte
+	Fixed a bug in bindctl where the removal of elements from a set
+	with default values was not stored, unless the set had been
+	modified in another way already.
+	(Trac #1343, git 25c802dd1c30580b94345e83eeb6a168ab329a33)
+
 308.	[build]		jelte
 	The configure script will now use pkg-config for finding
 	information about the Botan library. If pkg-config is unavailable,
diff --git a/src/lib/python/isc/config/ccsession.py b/src/lib/python/isc/config/ccsession.py
index c7eb8ad..2d998ce 100644
--- a/src/lib/python/isc/config/ccsession.py
+++ b/src/lib/python/isc/config/ccsession.py
@@ -543,6 +543,7 @@ class UIModuleCCSession(MultiConfigData):
                 cur_map = {}
             if value in cur_map:
                 del cur_map[value]
+                self.set_value(identifier, cur_map)
             else:
                 raise isc.cc.data.DataNotFoundError(value + " not found in named_set " + str(identifier))
 
diff --git a/src/lib/python/isc/config/tests/ccsession_test.py b/src/lib/python/isc/config/tests/ccsession_test.py
index 1c63957..70ac114 100644
--- a/src/lib/python/isc/config/tests/ccsession_test.py
+++ b/src/lib/python/isc/config/tests/ccsession_test.py
@@ -756,6 +756,17 @@ class TestUIModuleCCSession(unittest.TestCase):
         uccs = self.create_uccs_named_set(fake_conn)
         value, status = uccs.get_value("/Spec32/named_set_item")
         self.assertEqual({'a': 1, 'b': 2}, value)
+
+        # make sure that removing from default actually removes it
+        uccs.remove_value("/Spec32/named_set_item", "a")
+        value, status = uccs.get_value("/Spec32/named_set_item")
+        self.assertEqual({'b': 2}, value)
+        self.assertEqual(uccs.LOCAL, status)
+
+        # ok, put it back now
+        uccs.add_value("/Spec32/named_set_item", "a")
+        uccs.set_value("/Spec32/named_set_item/a", 1)
+
         uccs.add_value("/Spec32/named_set_item", "foo")
         value, status = uccs.get_value("/Spec32/named_set_item")
         self.assertEqual({'a': 1, 'b': 2, 'foo': 3}, value)