!102 Fix dsidm role subtree-status fails with TypeError

From: @wk333 
Reviewed-by: @starlet-dx 
Signed-off-by: @starlet-dx
This commit is contained in:
openeuler-ci-bot 2024-11-26 06:54:13 +00:00 committed by Gitee
commit 8b6580fcc7
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 16 additions and 1 deletions

View File

@ -6,7 +6,7 @@ ExcludeArch: i686
Name: 389-ds-base
Summary: Base 389 Directory Server
Version: 3.1.1
Release: 2
Release: 3
License: GPLv3+
URL: https://www.port389.org
Source0: https://releases.pagure.org/389-ds-base/389-ds-base-%{version}.tar.bz2
@ -16,6 +16,7 @@ Source2: 389-ds-base-devel.README
# Refer: https://github.com/389ds/389-ds-base/pull/5374
Patch0: fix-dsidm-posixgroup-get_dn-fails-with-search_ext.patch
Patch1: remove-where-cockpit_present-is-called.patch
Patch2: fix-dsidm-role-subtree-status-fails-with-TypeError.patch
BuildRequires: nspr-devel nss-devel >= 3.34 perl-generators openldap-devel libdb-devel cyrus-sasl-devel icu
BuildRequires: libicu-devel pcre-devel cracklib-devel gcc-c++ net-snmp-devel lm_sensors-devel bzip2-devel
@ -322,6 +323,9 @@ exit 0
%{_mandir}/*/*
%changelog
* Tue Nov 26 2024 wangkai <13474090681@163.com> - 3.1.1-3
- Fix dsidm role subtree-status fails with TypeError
* Mon Nov 25 2024 xu_ping <707078654@qq.com> - 3.1.1-2
- fix name cockpit_present is not defined.

View File

@ -0,0 +1,11 @@
--- 389-ds-base-3.1.1/src/lib389/lib389/cli_idm/role.py 2024-11-26 14:12:42.805280521 +0800
+++ 389-ds-base-3.1.1/src/lib389/lib389/cli_idm/role.py 2024-11-26 14:13:08.157340335 +0800
@@ -109,7 +109,7 @@
filter = ""
scope = ldap.SCOPE_SUBTREE
- role_list = Roles(inst, basedn).filter(filter, scope)
+ role_list = Roles(inst, basedn).filter(filter, scope=scope)
if not role_list:
raise ValueError(f"No entries were found under {basedn} or the user doesn't have an access")