Browse Source

Update the version. Remove the "v" prefix.
Now the VERSION string consists of the module name, the module version
number, and the overall BIND 10 version number (set in configure.ac).

This is for Trac ticket #302 with further discussion on jabber
a couple days ago.

I plan to do similar for other modules but only completed two others
because beyond that some were missing feature or were broken
for attempting to see the version. (I will report separately.)

No changelog entry. This is minor.


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

Jeremy C. Reed 14 years ago
parent
commit
f89a38327d
1 changed files with 5 additions and 3 deletions
  1. 5 3
      src/bin/bind10/bind10.py.in

+ 5 - 3
src/bin/bind10/bind10.py.in

@@ -65,7 +65,9 @@ import posix
 import isc.cc
 
 # This is the version that gets displayed to the user.
-__version__ = "v20100531"
+# The VERSION string consists of the module name, the module version
+# number, and the overall BIND 10 version number (set in configure.ac).
+VERSION = "bind10 20100916 (BIND 10 @PACKAGE_VERSION@)"
 
 class RestartSchedule:
     """
@@ -627,7 +629,7 @@ def main():
 
 
     # 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)")
@@ -680,7 +682,7 @@ def main():
 
     # 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/