BIND 10 master, updated. baf3d8783ad1bc05bbe4db507325e9bfcd8d9be9 [master] hack to check for previous isc/log directory

BIND 10 source code commits bind10-changes at lists.isc.org
Tue Jul 5 16:14:06 UTC 2011


The branch, master has been updated
       via  baf3d8783ad1bc05bbe4db507325e9bfcd8d9be9 (commit)
      from  f9045d39a58a9b9287f3ece1022391a3b07e88d3 (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 baf3d8783ad1bc05bbe4db507325e9bfcd8d9be9
Author: Jeremy C. Reed <jreed at ISC.org>
Date:   Tue Jul 5 11:13:04 2011 -0500

    [master] hack to check for previous isc/log directory
    
    This is from patch ticket #1053 from jinmei.
    http://bind10.isc.org/attachment/ticket/1053/makefile.diff
    
    It is a workaround to problem with isc/log name reuse.

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

Summary of changes:
 src/lib/python/isc/log/Makefile.am |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/python/isc/log/Makefile.am b/src/lib/python/isc/log/Makefile.am
index b228caf..5ff2c28 100644
--- a/src/lib/python/isc/log/Makefile.am
+++ b/src/lib/python/isc/log/Makefile.am
@@ -23,6 +23,15 @@ log_la_LIBADD += $(PYTHON_LIB)
 # This is not installed, it helps locate the module during tests
 EXTRA_DIST = __init__.py
 
+# We're going to abuse install-data-local for a pre-install check.
+# This is to be considered a short term hack and is expected to be removed
+# in a near future version.
+install-data-local:
+	if test -d @pyexecdir@/isc/log; then \
+		echo "@pyexecdir@/isc/log is deprecated, and will confuse newer versions.  Please (re)move it by hand."; \
+		exit 1; \
+	fi
+
 pytest:
 	$(SHELL) tests/log_test
 




More information about the bind10-changes mailing list