BIND 10 trac875, updated. 7b25152b5bbbaff6840f88ad7ff2684f8b8062a6 [trac875] We don't use isc.dns, but pydnspp

[BIND 10 source code commits]

The branch, trac875 has been updated
       via  7b25152b5bbbaff6840f88ad7ff2684f8b8062a6 (commit)
       via  76a81d33b95b12341515cc6ca5718d72a242ab59 (commit)
      from  8339141a4a64043e82685f0e6793b592b7ac820a (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 7b25152b5bbbaff6840f88ad7ff2684f8b8062a6
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Wed May 11 19:51:15 2011 +0200

    [trac875] We don't use isc.dns, but pydnspp

commit 76a81d33b95b12341515cc6ca5718d72a242ab59
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Wed May 11 19:41:13 2011 +0200

    [trac875] Install the plugin

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

Summary of changes:
 src/bin/cfgmgr/plugins/Makefile.am  |    4 ++--
 src/bin/cfgmgr/plugins/tsig_keys.py |    5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/cfgmgr/plugins/Makefile.am b/src/bin/cfgmgr/plugins/Makefile.am
index d49d50d..fdd1e89 100644
--- a/src/bin/cfgmgr/plugins/Makefile.am
+++ b/src/bin/cfgmgr/plugins/Makefile.am
@@ -1,5 +1,5 @@
 SUBDIRS = tests
 EXTRA_DIST = README
 
-# TODO: We need to distribute the .py files and .spec files. We also need to
-# install them. How to do that correctly?
+config_plugindir = @prefix@/share/@PACKAGE@/config_plugins
+config_plugin_DATA = tsig_keys.py tsig_keys.spec
diff --git a/src/bin/cfgmgr/plugins/tsig_keys.py b/src/bin/cfgmgr/plugins/tsig_keys.py
index 7a19489..d29482b 100644
--- a/src/bin/cfgmgr/plugins/tsig_keys.py
+++ b/src/bin/cfgmgr/plugins/tsig_keys.py
@@ -15,8 +15,7 @@
 
 from isc.config.module_spec import module_spec_from_file
 from isc.util.file import path_search
-from isc.dns import TSIGKey
-import pydnspp
+from pydnspp import TSIGKey, InvalidParameter
 from bind10_config import PLUGIN_PATHS
 spec = module_spec_from_file(path_search('tsig_keys.spec', PLUGIN_PATHS))
 
@@ -32,7 +31,7 @@ def check(config):
     for key in keys:
         try:
             name = str(TSIGKey(key).get_key_name())
-        except pydnspp.InvalidParameter as e:
+        except InvalidParameter as e:
             return "TSIG: " + str(e)
         if name in keyNames:
             return "Multiple TSIG keys with name '" + name + "'"