Merge "Make --version option print a more detailed client version."

quantumclient/shell.py

@@ -32,6 +32,7 @@ from quantumclient.common import clientmanager
 from quantumclient.common import exceptions as exc
 from quantumclient.common import utils
 from quantumclient.openstack.common import strutils
+from quantumclient.version import __version__
 
 
 VERSION = '2.0'
@@ -324,7 +325,7 @@ class QuantumShell(app.App):
         parser.add_argument(
             '--version',
             action='version',
-            version='%(prog)s {0}'.format(version), )
+            version=__version__, )
         parser.add_argument(
             '-v', '--verbose',
             action='count',

quantumclient/version.py

@@ -0,0 +1,22 @@
+# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
+# All Rights Reserved
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+#
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+# @author: Carl Baldwin, Hewlett-Packard
+
+import pbr.version
+
+
+__version__ = pbr.version.VersionInfo('python-quantumclient').version_string()