diff options
| -rw-r--r-- | ipa.1 | 6 | ||||
| -rw-r--r-- | ipalib/constants.py | 4 | ||||
| -rw-r--r-- | ipalib/plugable.py | 3 |
3 files changed, 10 insertions, 3 deletions
@@ -37,7 +37,7 @@ Load configuration from \fIFILE\fR. \fB\-d\fR, \fB\-\-debug\fR Produce full debugging output. .TP -\fB\-\-\-delegate\fR +\fB\-\-delegate\fR Delegate the user's TGT to the IPA server .TP \fB\-e\fR \fIKEY=VAL\fR @@ -56,7 +56,9 @@ Prompt for all parameters of \fICOMMAND\fR, even if they are optional. Don't fall back to other IPA servers if the default doesn't work. .TP \fB\-v\fR, \fB\-\-verbose\fR -Produce verbose output. A second \-v displays the XML\-RPC request +Produce verbose output. A second \-v displays the XML\-RPC request. +\fB\-\-version\fR +Display the IPA version and API version. .SH "COMMANDS" The principal function of the CLI is to execute administrative commands specified by the \fICOMMAND\fR argument. The majority of commands are executed remotely over XML\-RPC on a IPA server listed in the configuration file (see FILES section of this manual page). diff --git a/ipalib/constants.py b/ipalib/constants.py index e98eee6f8..2269189f4 100644 --- a/ipalib/constants.py +++ b/ipalib/constants.py @@ -23,7 +23,8 @@ All constants centralised in one file. """ import socket from ipapython.dn import DN -from ipapython.version import VERSION +from ipapython.version import VERSION, API_VERSION + try: FQDN = socket.getfqdn() except: @@ -65,6 +66,7 @@ CONFIG_SECTION = 'global' # This is a tuple instead of a dict so that it is immutable. # To create a dict with this config, just "d = dict(DEFAULT_CONFIG)". DEFAULT_CONFIG = ( + ('api_version', API_VERSION), ('version', VERSION), # Domain, realm, basedn: diff --git a/ipalib/plugable.py b/ipalib/plugable.py index 216f9c08a..a6504d162 100644 --- a/ipalib/plugable.py +++ b/ipalib/plugable.py @@ -43,6 +43,7 @@ from text import _ from base import ReadOnly, NameSpace, lock, islocked, check_name from constants import DEFAULT_CONFIG from ipapython.ipa_log_manager import * +from ipapython.version import VERSION, API_VERSION # FIXME: Updated constants.TYPE_ERROR to use this clearer format from wehjit: TYPE_ERROR = '%s: need a %r; got a %r: %r' @@ -559,6 +560,8 @@ class API(DictProxy): formatter=IPAHelpFormatter(), usage='%prog [global-options] COMMAND [command-options]', description='Manage an IPA domain', + version=('VERSION: %s, API_VERSION: %s' + % (VERSION, API_VERSION)), epilog='\n'.join([ 'See "ipa help topics" for available help topics.', 'See "ipa help <TOPIC>" for more information on a ' |