|
 |
e0ab38 |
From 88c057bc798b2606bafbed5c0b76475b0640b5e8 Mon Sep 17 00:00:00 2001
|
|
|
e0ab38 |
From: Jan Cholasta <jcholast@redhat.com>
|
|
|
e0ab38 |
Date: Tue, 12 Jan 2016 15:41:43 +0100
|
|
|
e0ab38 |
Subject: [PATCH] ipalib: assume version 2.0 when skip_version_check is enabled
|
|
|
e0ab38 |
|
|
|
e0ab38 |
https://fedorahosted.org/freeipa/ticket/5601
|
|
|
e0ab38 |
|
|
|
e0ab38 |
Reviewed-By: Martin Basti <mbasti@redhat.com>
|
|
|
e0ab38 |
---
|
|
|
e0ab38 |
ipalib/frontend.py | 3 +--
|
|
|
e0ab38 |
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
|
e0ab38 |
|
|
|
e0ab38 |
diff --git a/ipalib/frontend.py b/ipalib/frontend.py
|
|
|
e0ab38 |
index 2ca3aaea82ea63702052eedbd7e4081f239cbaed..8adcee925a24fd546d7000e9239353da273e0bc9 100644
|
|
|
e0ab38 |
--- a/ipalib/frontend.py
|
|
|
e0ab38 |
+++ b/ipalib/frontend.py
|
|
|
e0ab38 |
@@ -26,7 +26,6 @@ from distutils import version
|
|
|
e0ab38 |
|
|
|
e0ab38 |
from ipapython.version import API_VERSION
|
|
|
e0ab38 |
from ipapython.ipa_log_manager import root_logger
|
|
|
e0ab38 |
-from ipalib.capabilities import VERSION_WITHOUT_CAPABILITIES
|
|
|
e0ab38 |
from base import NameSpace
|
|
|
e0ab38 |
from plugable import Plugin
|
|
|
e0ab38 |
from parameters import create_param, Param, Str, Flag, Password
|
|
|
e0ab38 |
@@ -425,7 +424,7 @@ class Command(HasParam):
|
|
|
e0ab38 |
if version_provided:
|
|
|
e0ab38 |
self.verify_client_version(unicode(options['version']))
|
|
|
e0ab38 |
elif self.api.env.skip_version_check and not self.api.env.in_server:
|
|
|
e0ab38 |
- options['version'] = VERSION_WITHOUT_CAPABILITIES
|
|
|
e0ab38 |
+ options['version'] = u'2.0'
|
|
|
e0ab38 |
else:
|
|
|
e0ab38 |
options['version'] = API_VERSION
|
|
|
e0ab38 |
params = self.args_options_2_params(*args, **options)
|
|
|
e0ab38 |
--
|
|
|
e0ab38 |
2.4.3
|
|
|
e0ab38 |
|