Ticket #302: bind10.2.diff

Makefile.am

@@ -23 +23 @@
 # this is done here since configure.ac AC_OUTPUT doesn't expand exec_prefix
 bind10: bind10.py
         $(SED) -e "s|@@PYTHONPATH@@|@pyexecdir@|" \
+               -e "s|@@PACKAGE_VERSION@@|$(PACKAGE_VERSION)|" \
                -e "s|@@LIBEXECDIR@@|$(pkglibexecdir)|" bind10.py >$@
         chmod a+x $@
 

bind10.py.in

@@ -65 +65 @@
 import isc.cc
 
 # This is the version that gets displayed to the user.
-__version__ = "v20100531"
+__version__ = "20100809"
+version = "bind10 " + __version__ + " (BIND 10 @@PACKAGE_VERSION@@)"
 
 class RestartSchedule:
     """
@@ -605 +606 @@
 
 
     # Parse any command-line options.
-    parser = OptionParser(version=__version__)
+    parser = OptionParser(version=version)
     parser.add_option("-a", "--address", dest="address", type="string",
                       action="callback", callback=check_addr, default='',
                       help="address the b10-auth daemon will use (default: listen on all addresses)")
@@ -658 +659 @@
 
     # Announce startup.
     if options.verbose:
-        sys.stdout.write("BIND 10 %s\n" % __version__)
+        sys.stdout.write("%s\n" % version)
 
     # TODO: set process name, perhaps by:
     #       http://code.google.com/p/procname/