BIND 10 master, updated. a435f3ac50667bcb76dca44b7b5d152f45432b57 [master] Merge branch 'trac1404'
BIND 10 source code commits
bind10-changes at lists.isc.org
Mon Nov 21 20:00:52 UTC 2011
The branch, master has been updated
via a435f3ac50667bcb76dca44b7b5d152f45432b57 (commit)
via 6dd270220a4bac70fa4cd6a898e331b658fe0af2 (commit)
via 1bb5168b7014a83690d1bb363dbcc0fa6d8fd7f1 (commit)
via 4d3aef6a83965e26781d6b74f0ff913926845c7c (commit)
from 77d69c99f2b3cc8ee627d8f73174ead9f03da412 (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 a435f3ac50667bcb76dca44b7b5d152f45432b57
Merge: 77d69c9 6dd2702
Author: JINMEI Tatuya <jinmei at isc.org>
Date: Mon Nov 21 11:46:38 2011 -0800
[master] Merge branch 'trac1404'
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 2 +-
compatcheck/Makefile.am | 8 ++++
compatcheck/README | 5 +++
compatcheck/sqlite3-difftbl-check.py.in | 60 +++++++++++++++++++++++++++++++
configure.ac | 3 ++
5 files changed, 77 insertions(+), 1 deletions(-)
create mode 100644 compatcheck/Makefile.am
create mode 100644 compatcheck/README
create mode 100755 compatcheck/sqlite3-difftbl-check.py.in
-----------------------------------------------------------------------
diff --git a/Makefile.am b/Makefile.am
index 50aa6b9..cc91a56 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = doc src tests
+SUBDIRS = compatcheck doc src tests
USE_LCOV=@USE_LCOV@
LCOV=@LCOV@
GENHTML=@GENHTML@
diff --git a/compatcheck/Makefile.am b/compatcheck/Makefile.am
new file mode 100644
index 0000000..029578d
--- /dev/null
+++ b/compatcheck/Makefile.am
@@ -0,0 +1,8 @@
+noinst_SCRIPTS = sqlite3-difftbl-check.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:
+ $(PYTHON) sqlite3-difftbl-check.py \
+ $(localstatedir)/$(PACKAGE)/zone.sqlite3
diff --git a/compatcheck/README b/compatcheck/README
new file mode 100644
index 0000000..8381e60
--- /dev/null
+++ b/compatcheck/README
@@ -0,0 +1,5 @@
+This directory is a collection of compatibility checker programs.
+They will be run before any other installation attempts on 'make install'
+to see if the installation causes any substantial compatibility problems
+with existing configuratons. If any checker program finds an issue,
+'make install' will stop at that point.
diff --git a/compatcheck/sqlite3-difftbl-check.py.in b/compatcheck/sqlite3-difftbl-check.py.in
new file mode 100755
index 0000000..7c28894
--- /dev/null
+++ b/compatcheck/sqlite3-difftbl-check.py.in
@@ -0,0 +1,60 @@
+#!@PYTHON@
+
+# Copyright (C) 2011 Internet Systems Consortium.
+#
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SYSTEMS CONSORTIUM
+# DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
+# INTERNET SYSTEMS CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
+# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+import os, sqlite3, sys
+from optparse import OptionParser
+
+usage = 'usage: %prog [options] db_file'
+parser = OptionParser(usage=usage)
+parser.add_option("-u", "--upgrade", action="store_true",
+ dest="upgrade", default=False,
+ help="Upgrade the database file [default: %default]")
+(options, args) = parser.parse_args()
+if len(args) == 0:
+ parser.error('missing argument')
+
+db_file = args[0]
+
+# If the file doesn't exist, there's nothing to do
+if not os.path.exists(db_file):
+ sys.exit(0)
+
+conn = sqlite3.connect(db_file)
+cur = conn.cursor()
+try:
+ # This can be anything that works iff the "diffs" table exists
+ cur.execute('SELECT name FROM diffs DESC LIMIT 1')
+except sqlite3.OperationalError as ex:
+ # If it fails with 'no such table', create a new one or fail with
+ # warning depending on the --upgrade command line option.
+ if str(ex) == 'no such table: diffs':
+ if options.upgrade:
+ cur.execute('CREATE TABLE diffs (id INTEGER PRIMARY KEY, ' +
+ 'zone_id INTEGER NOT NULL, ' +
+ 'version INTEGER NOT NULL, ' +
+ 'operation INTEGER NOT NULL, ' +
+ 'name STRING NOT NULL COLLATE NOCASE, ' +
+ 'rrtype STRING NOT NULL COLLATE NOCASE, ' +
+ 'ttl INTEGER NOT NULL, rdata STRING NOT NULL)')
+ else:
+ sys.stdout.write('Found an older version of SQLite3 DB file: ' +
+ db_file + '\n' + "Peform '" + os.getcwd() +
+ "/sqlite3-difftbl-check.py --upgrade " +
+ db_file + "'\n" +
+ 'before continuing install.\n')
+ sys.exit(1)
+conn.close()
diff --git a/configure.ac b/configure.ac
index 2692ddb..8302e1e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -816,6 +816,7 @@ AM_CONDITIONAL(INSTALL_CONFIGURATIONS, test x$install_configurations = xyes || t
AC_CONFIG_FILES([Makefile
doc/Makefile
doc/guide/Makefile
+ compatcheck/Makefile
src/Makefile
src/bin/Makefile
src/bin/bind10/Makefile
@@ -937,6 +938,7 @@ AC_CONFIG_FILES([Makefile
tests/tools/badpacket/tests/Makefile
])
AC_OUTPUT([doc/version.ent
+ compatcheck/sqlite3-difftbl-check.py
src/bin/cfgmgr/b10-cfgmgr.py
src/bin/cfgmgr/tests/b10-cfgmgr_test.py
src/bin/cmdctl/cmdctl.py
@@ -1016,6 +1018,7 @@ AC_OUTPUT([doc/version.ent
tests/system/ixfr/in-3/setup.sh
tests/system/ixfr/in-4/setup.sh
], [
+ chmod +x compatcheck/sqlite3-difftbl-check.py
chmod +x src/bin/cmdctl/run_b10-cmdctl.sh
chmod +x src/bin/xfrin/run_b10-xfrin.sh
chmod +x src/bin/xfrout/run_b10-xfrout.sh
More information about the bind10-changes
mailing list