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

BIND 10 source code commits bind10-changes at lists.isc.org
Fri May 13 18:04:12 UTC 2011


The branch, master has been updated
       via  a407cb3d58c78b93afe294be13e7b360b11fd542 (commit)
       via  1cccbc6845d795f8d8e2b0c7ba637fb28e179e71 (commit)
      from  081891b38f05f9a186814ab7d1cd5c572b8f777f (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 a407cb3d58c78b93afe294be13e7b360b11fd542
Merge: 1cccbc6845d795f8d8e2b0c7ba637fb28e179e71 081891b38f05f9a186814ab7d1cd5c572b8f777f
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Fri May 13 20:03:52 2011 +0000

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

commit 1cccbc6845d795f8d8e2b0c7ba637fb28e179e71
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Fri May 13 20:03:22 2011 +0000

    [master] Fix path substitution file

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

Summary of changes:
 src/lib/python/bind10_config.py.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/python/bind10_config.py.in b/src/lib/python/bind10_config.py.in
index fe4adb5..4a38903 100644
--- a/src/lib/python/bind10_config.py.in
+++ b/src/lib/python/bind10_config.py.in
@@ -27,6 +27,7 @@ def reload():
                                            "@PACKAGE_NAME@",
                                            "msgq_socket").replace("${prefix}",
                                                                   "@prefix@")
+    PREFIX = "@prefix@"
 
     # If B10_FROM_SOURCE is set in the environment, we use data files
     # from a directory relative to the value of that variable, or, if defined,
@@ -43,7 +44,6 @@ def reload():
             DATA_PATH = os.environ["B10_FROM_SOURCE"]
         PLUGIN_PATHS = [DATA_PATH + '/src/bin/cfgmgr/plugins']
     else:
-        PREFIX = "@prefix@"
         DATA_PATH = "@localstatedir@/@PACKAGE@".replace("${prefix}", PREFIX)
         PLUGIN_PATHS = ["@prefix@/share/@PACKAGE@/config_plugins"]
     # For testing the plugins so they can find their own spec files




More information about the bind10-changes mailing list