|
 |
6ec482 |
From 78c4838bcf3528018b06d73d1b82bde7f575f2db Mon Sep 17 00:00:00 2001
|
|
|
6ec482 |
From: Rob Crittenden <rcritten@redhat.com>
|
|
|
6ec482 |
Date: Mon, 16 Sep 2019 09:38:19 -0400
|
|
|
6ec482 |
Subject: [PATCH] Disable deprecated-lambda check in adtrust upgrade code
|
|
|
6ec482 |
|
|
|
6ec482 |
It is interesting that we don't have this problem with newer
|
|
|
6ec482 |
Python and pylint versions. Ignoring to try to keep the code
|
|
|
6ec482 |
more in line with newer releases.
|
|
|
6ec482 |
|
|
|
6ec482 |
Reviewed-By: Rob Crittenden <rcritten@redhat.com>
|
|
|
6ec482 |
Reviewed-By: Florence Blanc-Renaud <flo@redhat.com>
|
|
|
6ec482 |
---
|
|
|
6ec482 |
ipaserver/install/plugins/adtrust.py | 2 ++
|
|
|
6ec482 |
1 file changed, 2 insertions(+)
|
|
|
6ec482 |
|
|
|
6ec482 |
diff --git a/ipaserver/install/plugins/adtrust.py b/ipaserver/install/plugins/adtrust.py
|
|
|
6ec482 |
index fca83aa6df2cc3fafca91f2ed55339dba016a1fa..950b7b9c82f1b0e115675ff8093d1bd02e913ae2 100644
|
|
|
6ec482 |
--- a/ipaserver/install/plugins/adtrust.py
|
|
|
6ec482 |
+++ b/ipaserver/install/plugins/adtrust.py
|
|
|
6ec482 |
@@ -583,6 +583,7 @@ class update_tdo_to_new_layout(Updater):
|
|
|
6ec482 |
# Old style, no ipaAllowedToPerform;read_keys in the entry,
|
|
|
6ec482 |
# use defaults that ipasam should have set when creating a
|
|
|
6ec482 |
# trust
|
|
|
6ec482 |
+ # pylint: disable=deprecated-lambda
|
|
|
6ec482 |
read_keys = list(map(
|
|
|
6ec482 |
lambda x: x.format(basedn=self.api.env.basedn),
|
|
|
6ec482 |
trust_read_keys_template))
|
|
|
6ec482 |
@@ -770,6 +771,7 @@ class update_tdo_default_read_keys_permissions(Updater):
|
|
|
6ec482 |
|
|
|
6ec482 |
read_keys = tdo.get('ipaAllowedToPerform;read_keys', [])
|
|
|
6ec482 |
if not read_keys:
|
|
|
6ec482 |
+ # pylint: disable=deprecated-lambda
|
|
|
6ec482 |
read_keys_values = list(map(
|
|
|
6ec482 |
lambda x: x.format(basedn=self.api.env.basedn),
|
|
|
6ec482 |
trust_read_keys_template))
|
|
|
6ec482 |
--
|
|
|
6ec482 |
2.20.1
|
|
|
6ec482 |
|