From 970897cc4676735cb845bcea4db2538e9145a690 Mon Sep 17 00:00:00 2001 From: Laurent Indermuehle Date: Tue, 10 Oct 2023 17:48:23 +0200 Subject: [PATCH] Revert non relevant changes to have cleaner patch --- plugins/module_utils/user.py | 4 ++-- tests/sanity/ignore-2.15.txt | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/module_utils/user.py b/plugins/module_utils/user.py index 366af56..0b37f36 100644 --- a/plugins/module_utils/user.py +++ b/plugins/module_utils/user.py @@ -533,8 +533,8 @@ def privileges_get(module, cursor, user, host, maria_role=False): raise InvalidPrivsError('unable to parse the MySQL grant string: %s' % grant[0]) - privileges = [x.strip() for x in res.group(1).split(",")] - privileges = [pick(x) for x in privileges] + privileges = res.group(1).split(",") + privileges = [pick(x.strip()) for x in privileges] # Handle cases when there's privs like GRANT SELECT (colA, ...) in privs. # To this point, the privileges list can look like diff --git a/tests/sanity/ignore-2.15.txt b/tests/sanity/ignore-2.15.txt index 5565108..da0354c 100644 --- a/tests/sanity/ignore-2.15.txt +++ b/tests/sanity/ignore-2.15.txt @@ -6,4 +6,5 @@ plugins/modules/mysql_info.py validate-modules:parameter-list-no-elements plugins/modules/mysql_query.py validate-modules:parameter-list-no-elements plugins/modules/mysql_user.py validate-modules:undocumented-parameter plugins/modules/mysql_variables.py validate-modules:doc-required-mismatch +plugins/module_utils/mysql.py pylint:unused-import plugins/module_utils/version.py pylint:unused-import