Merge branch 'fix-version' of https://github.com/AlexanderS/bcfg2

2 files changed, 16 insertions, 2 deletions

diff --git a/src/lib/Bcfg2/Options/Parser.py b/src/lib/Bcfg2/Options/Parser.py
index c846e8093..d146e3aa2 100644
--- a/src/lib/Bcfg2/Options/Parser.py
+++ b/src/lib/Bcfg2/Options/Parser.py
@@ -6,7 +6,7 @@ import sys
 
 from Bcfg2.version import __version__
 from Bcfg2.Compat import ConfigParser
-from Bcfg2.Options import Option, PathOption, BooleanOption, _debug
+from Bcfg2.Options import Option, PathOption, _debug
 
 __all__ = ["setup", "OptionParserException", "Parser", "get_parser",
            "new_parser"]
@@ -43,9 +43,16 @@ class Parser(argparse.ArgumentParser):
                             help="Path to configuration file",
                             default="/etc/bcfg2.conf")
 
+    #: Verbose version string that is printed if executed with --version
+    _version_string = "%s %s on Python %s" % (
+        os.path.basename(sys.argv[0]),
+        __version__,
+        ".".join(str(v) for v in sys.version_info[0:3]))
+
     #: Builtin options that apply to all commands
     options = [configfile,
-               BooleanOption('--version', help="Print the version and exit"),
+               Option('--version', help="Print the version and exit",
+                      action="version", version=_version_string),
                Option('-E', '--encoding', metavar='<encoding>',
                       default='UTF-8', help="Encoding of config files",
                       cf=('components', 'encoding'))]
diff --git a/testsuite/Testsrc/Testlib/TestOptions/TestOptions.py b/testsuite/Testsrc/Testlib/TestOptions/TestOptions.py
index a2dc8ffe2..034a4580a 100644
--- a/testsuite/Testsrc/Testlib/TestOptions/TestOptions.py
+++ b/testsuite/Testsrc/Testlib/TestOptions/TestOptions.py
@@ -185,6 +185,13 @@ class TestBasicOptions(OptionTestCase):
         options = self._test_options(env={"TEST_PATH_OPTION": "/foo"})
         self.assertEqual(options.test_path_option, "/foo")
 
+    def test_version(self):
+        """print version and exit on --version"""
+        self.assertRaises(
+            SystemExit,
+            self._test_options,
+            options=['--version'])
+
     def test_set_boolean_in_cli(self):
         """set boolean options in CLI options."""
         # passing the option yields the reverse of the default, no