[svn] commit: r3599 - in /trunk: ./ configure.ac src/bin/bind10/bind10.py.in src/lib/python/isc/datasrc/Makefile.am src/lib/python/isc/datasrc/master.py src/lib/python/isc/datasrc/tests/

[BIND 10 source code commits]

Author: jinmei
Date: Mon Nov 22 14:44:15 2010
New Revision: 3599

Log:
merged trac #411 (TTL parser bug)

Added:
    trunk/src/lib/python/isc/datasrc/tests/
      - copied from r3598, branches/trac411/src/lib/python/isc/datasrc/tests/
Modified:
    trunk/   (props changed)
    trunk/configure.ac
    trunk/src/bin/bind10/bind10.py.in   (props changed)
    trunk/src/lib/python/isc/datasrc/Makefile.am
    trunk/src/lib/python/isc/datasrc/master.py

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Mon Nov 22 14:44:15 2010
@@ -493,6 +493,7 @@
                  src/lib/python/isc/util/Makefile
                  src/lib/python/isc/util/tests/Makefile
                  src/lib/python/isc/datasrc/Makefile
+                 src/lib/python/isc/datasrc/tests/Makefile
                  src/lib/python/isc/cc/Makefile
                  src/lib/python/isc/cc/tests/Makefile
                  src/lib/python/isc/config/Makefile

Modified: trunk/src/lib/python/isc/datasrc/Makefile.am
==============================================================================
--- trunk/src/lib/python/isc/datasrc/Makefile.am (original)
+++ trunk/src/lib/python/isc/datasrc/Makefile.am Mon Nov 22 14:44:15 2010
@@ -1,3 +1,5 @@
+SUBDIRS = . tests
+
 python_PYTHON = __init__.py master.py sqlite3_ds.py
 
 pythondir = $(pyexecdir)/isc/datasrc

Modified: trunk/src/lib/python/isc/datasrc/master.py
==============================================================================
--- trunk/src/lib/python/isc/datasrc/master.py (original)
+++ trunk/src/lib/python/isc/datasrc/master.py Mon Nov 22 14:44:15 2010
@@ -103,7 +103,7 @@
 # isttl: check whether a string is a valid TTL specifier.
 # returns: boolean
 #########################################################################
-ttl_regex = re.compile('([0-9]+[wdhms]?)+', re.I)
+ttl_regex = re.compile('([0-9]+[wdhms]?)+$', re.I)
 def isttl(s):
     global ttl_regex
     if ttl_regex.match(s):