BIND 10 master, updated. 4929dc565823e49c94b1efea1543ba23d9745c9f Merge branch 'master' of ssh://bind10.isc.org/var/bind10/git/bind10

[BIND 10 source code commits]

The branch, master has been updated
       via  4929dc565823e49c94b1efea1543ba23d9745c9f (commit)
       via  98e93921ae905aefef6646fc8839e3f4a30a37e1 (commit)
       via  d27da40718b797aca37ad5bab7215592a089627a (commit)
      from  c7bb38c99c9afa049c7336ea3f827aa41a1b2ea0 (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 4929dc565823e49c94b1efea1543ba23d9745c9f
Merge: 98e93921ae905aefef6646fc8839e3f4a30a37e1 c7bb38c99c9afa049c7336ea3f827aa41a1b2ea0
Author: Jelte Jansen <jelte at isc.org>
Date:   Wed Apr 6 10:48:53 2011 +0200

    Merge branch 'master' of ssh://bind10.isc.org/var/bind10/git/bind10

commit 98e93921ae905aefef6646fc8839e3f4a30a37e1
Merge: 1ec7e1ccd24b25501902e0fc29fddf400f2ebdb1 d27da40718b797aca37ad5bab7215592a089627a
Author: Jelte Jansen <jelte at isc.org>
Date:   Wed Apr 6 10:12:17 2011 +0200

    Merge branch 'trac671'

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

Summary of changes:
 src/lib/python/isc/config/config_data.py           |    4 ++--
 .../python/isc/config/tests/config_data_test.py    |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/python/isc/config/config_data.py b/src/lib/python/isc/config/config_data.py
index 582c11c..cee1d34 100644
--- a/src/lib/python/isc/config/config_data.py
+++ b/src/lib/python/isc/config/config_data.py
@@ -461,8 +461,8 @@ class MultiConfigData:
                 spec_part_list = spec_part['list_item_spec']
                 list_value, status = self.get_value(identifier)
                 if list_value is None:
-                    print("Error: identifier '%s' not found" % identifier)
-                    return
+                    raise isc.cc.data.DataNotFoundError(identifier)
+
                 if type(list_value) != list:
                     # the identifier specified a single element
                     self._append_value_item(result, spec_part_list, identifier, all)
diff --git a/src/lib/python/isc/config/tests/config_data_test.py b/src/lib/python/isc/config/tests/config_data_test.py
index 1aded94..923e0b6 100644
--- a/src/lib/python/isc/config/tests/config_data_test.py
+++ b/src/lib/python/isc/config/tests/config_data_test.py
@@ -465,8 +465,8 @@ class TestMultiConfigData(unittest.TestCase):
 
         module_spec = isc.config.module_spec_from_file(self.data_path + os.sep + "spec24.spec")
         self.mcd.set_specification(module_spec)
-        maps = self.mcd.get_value_maps("/Spec24/item")
-        self.assertEqual([], maps)
+        self.assertRaises(isc.cc.data.DataNotFoundError,
+                          self.mcd.get_value_maps, "/Spec24/item", 4)
         self.mcd._set_current_config({ "Spec24": { "item": [] } })
         maps = self.mcd.get_value_maps("/Spec24/item")
         self.assertEqual([{'default': False, 'modified': False, 'name': 'Spec24/item', 'type': 'list', 'value': []}], maps)