BIND 10 trac2438, updated. 610f3ecc55290ff4c2d3453f0f90c222b00a6f38 [2438] added path to pydnspp to PYTHONPATH for run_bindctl.

BIND 10 source code commits bind10-changes at lists.isc.org
Fri Jan 18 17:14:02 UTC 2013


The branch, trac2438 has been updated
       via  610f3ecc55290ff4c2d3453f0f90c222b00a6f38 (commit)
      from  003f49d97927cc4dd85c4a631611152e7e10bd1c (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 610f3ecc55290ff4c2d3453f0f90c222b00a6f38
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Fri Jan 18 09:13:25 2013 -0800

    [2438] added path to pydnspp to PYTHONPATH for run_bindctl.
    
    necessary for systest to pass on some environment

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

Summary of changes:
 src/bin/bindctl/run_bindctl.sh.in |    5 ++++-
 tests/system/ifconfig.sh          |    4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/bindctl/run_bindctl.sh.in b/src/bin/bindctl/run_bindctl.sh.in
index f4cc40c..999d7ee 100755
--- a/src/bin/bindctl/run_bindctl.sh.in
+++ b/src/bin/bindctl/run_bindctl.sh.in
@@ -20,7 +20,10 @@ export PYTHON_EXEC
 
 BINDCTL_PATH=@abs_top_builddir@/src/bin/bindctl
 
-PYTHONPATH=@abs_top_srcdir@/src/bin:@abs_top_builddir@/src/lib/python/isc/log_messages:@abs_top_builddir@/src/lib/python:@abs_top_builddir@/src/bin:@abs_top_srcdir@/src/lib/python
+# Note: lib/dns/python/.libs is necessary because __init__.py of isc package
+# automatically imports isc.datasrc, which then requires the DNS loadable
+# module.  #2145 should eliminate the need for it.
+PYTHONPATH=@abs_top_srcdir@/src/bin:@abs_top_builddir@/src/lib/python/isc/log_messages:@abs_top_builddir@/src/lib/python:@abs_top_builddir@/src/bin:@abs_top_srcdir@/src/lib/python:@abs_top_builddir@/src/lib/dns/python/.libs
 export PYTHONPATH
 
 # If necessary (rare cases), explicitly specify paths to dynamic libraries
diff --git a/tests/system/ifconfig.sh b/tests/system/ifconfig.sh
index c0c365a..7c695e2 100755
--- a/tests/system/ifconfig.sh
+++ b/tests/system/ifconfig.sh
@@ -63,7 +63,7 @@ esac
 case "$1" in
 
     start|up)
-	for ns in 1 2 3 4 5 6 7
+	for ns in 1 2 3 4 5 6 7 8
 	do
 		if test -n "$base"
 		then
@@ -145,7 +145,7 @@ case "$1" in
 	;;
 
     stop|down)
-	for ns in 7 6 5 4 3 2 1
+	for ns in 8 7 6 5 4 3 2 1
 	do
 		if test -n "$base"
 		then



More information about the bind10-changes mailing list