[svn] commit: r2945 - in /branches/trac302/src/bin: bindctl/bindctl-source.py.in msgq/msgq.py.in

[BIND 10 source code commits]

Author: jreed
Date: Thu Sep 16 17:54:29 2010
New Revision: 2945

Log:
Add a version for bindctl. Previously it just said "Bindctl".

Change version for msqg. Don't say "Paving the DNS Parking Lot" any more.
Note that verbose shows name twice:

	$ b10-msgq --verbose                                       <
	[b10-msgq] b10-msgq 20100818 (BIND 10 20100701)
	[b10-msgq] Listening

(ignore old BIND 10 date not changed in configure.ac yet)

Modified:
    branches/trac302/src/bin/bindctl/bindctl-source.py.in
    branches/trac302/src/bin/msgq/msgq.py.in

Modified: branches/trac302/src/bin/bindctl/bindctl-source.py.in
==============================================================================
--- branches/trac302/src/bin/bindctl/bindctl-source.py.in (original)
+++ branches/trac302/src/bin/bindctl/bindctl-source.py.in Thu Sep 16 17:54:29 2010
@@ -25,7 +25,10 @@
 import pprint
 from optparse import OptionParser, OptionValueError
 
-__version__ = 'Bindctl'
+# This is the version that gets displayed to the user.
+# The VERSION string consists of the module name, the module version
+# number, and the overall BIND 10 version number (set in configure.ac).
+VERSION = "bindctl 20100630 (BIND 10 @PACKAGE_VERSION@)"
 
 def prepare_config_commands(tool):
     '''Prepare fixed commands for local configuration editing'''
@@ -110,7 +113,7 @@
 
 if __name__ == '__main__':
     try:
-        parser = OptionParser(version = __version__)
+        parser = OptionParser(version = VERSION)
         set_bindctl_options(parser)
         (options, args) = parser.parse_args()
         server_addr = options.addr + ':' + str(options.port)

Modified: branches/trac302/src/bin/msgq/msgq.py.in
==============================================================================
--- branches/trac302/src/bin/msgq/msgq.py.in (original)
+++ branches/trac302/src/bin/msgq/msgq.py.in Thu Sep 16 17:54:29 2010
@@ -35,7 +35,9 @@
 import isc.cc
 
 # This is the version that gets displayed to the user.
-__version__ = "v20091030 (Paving the DNS Parking Lot)"
+# The VERSION string consists of the module name, the module version
+# number, and the overall BIND 10 version number (set in configure.ac).
+VERSION = "b10-msgq 20100818 (BIND 10 @PACKAGE_VERSION@)"
 
 class MsgQReceiveError(Exception): pass
 
@@ -414,7 +416,7 @@
         parser.values.msgq_port = intval
 
     # Parse any command-line options.
-    parser = OptionParser(version=__version__)
+    parser = OptionParser(version=VERSION)
     parser.add_option("-v", "--verbose", dest="verbose", action="store_true",
                       help="display more about what is going on")
     parser.add_option("-s", "--socket-file", dest="msgq_socket_file",
@@ -426,7 +428,7 @@
 
     # Announce startup.
     if options.verbose:
-        sys.stdout.write("[b10-msgq] MsgQ %s\n" % __version__)
+        sys.stdout.write("[b10-msgq] %s\n" % VERSION)
 
     msgq = MsgQ(options.msgq_socket_file, options.verbose)