Remove the parameter 'db_file' for command 'retransfer' of xfrin module, and xfrin.spec will not be generated by script.

git-svn-id: svn://bind10.isc.org/svn/bind10/trunk@3171 e5f2f494-b856-4b98-b285-d166d9295462

ChangeLog

@@ -1,7 +1,12 @@
+  107.  [func]       zhang likun
+	Remove the parameter 'db_file' for command 'retransfer' of 
+	xfrin module. xfrin.spec will not be generated by script.
+	(Trac #329, r3171)	
+
   106.  [bug]       zhang likun
 	When xfrin can't connect with one zone's master, it should tell
 	the bad news to zonemgr, so that zonemgr can reset the timer for
-	that zone. (Trac #329, r3169)
+	that zone. (Trac #329, r3170)
 
   105.  [bug]       Michal Vaner
 	Python processes: they no longer take 100% CPU while idle

configure.ac

@@ -515,7 +515,6 @@ AC_OUTPUT([src/bin/cfgmgr/b10-cfgmgr.py
            src/bin/cmdctl/cmdctl.spec.pre
            src/bin/xfrin/tests/xfrin_test
            src/bin/xfrin/xfrin.py
-           src/bin/xfrin/xfrin.spec.pre
            src/bin/xfrin/run_b10-xfrin.sh
            src/bin/xfrout/xfrout.py
            src/bin/xfrout/xfrout.spec.pre

src/bin/xfrin/Makefile.am

@@ -7,10 +7,11 @@ pkglibexec_SCRIPTS = b10-xfrin
 b10_xfrindir = $(DESTDIR)$(pkgdatadir)
 b10_xfrin_DATA = xfrin.spec
 
-CLEANFILES = b10-xfrin xfrin.pyc xfrin.spec
+CLEANFILES = b10-xfrin xfrin.pyc 
 
 man_MANS = b10-xfrin.8
 EXTRA_DIST = $(man_MANS) b10-xfrin.xml
+EXTRA_DIST += xfrin.spec
 
 if ENABLE_MAN
 
@@ -19,9 +20,6 @@ b10-xfrin.8: b10-xfrin.xml
 
 endif
 
-xfrin.spec: xfrin.spec.pre
-	$(SED) -e "s|@@LOCALSTATEDIR@@|$(localstatedir)|" xfrin.spec.pre >$@
-
 # TODO: does this need $$(DESTDIR) also?
 # this is done here since configure.ac AC_OUTPUT doesn't expand exec_prefix
 b10-xfrin: xfrin.py

src/bin/xfrin/xfrin.spec.pre.in

@@ -48,12 +48,6 @@
             "item_type": "integer",
             "item_optional": true,
             "item_default": 53
-          },
-          {
-            "item_name": "db_file",
-            "item_type": "string",
-            "item_optional": true,
-            "item_default": "@@LOCALSTATEDIR@@/@PACKAGE@/zone.sqlite3"
           }
         ]
       },