mirror of
https://github.com/ansible-collections/community.general.git
synced 2026-04-20 18:59:08 +00:00
[PR #11119/41923e43 backport][stable-12] fix ruff case SIM103 (#11132)
fix ruff case SIM103 (#11119)
* fix ruff case SIM103
* add changelog frag
(cherry picked from commit 41923e43bd)
Co-authored-by: Alexei Znamensky <103110+russoz@users.noreply.github.com>
This commit is contained in:
parent
ac6c6df2c7
commit
93d23cfef6
39 changed files with 115 additions and 230 deletions
|
|
@ -358,10 +358,7 @@ class Rhsm:
|
|||
|
||||
args = [SUBMAN_CMD, "identity"]
|
||||
rc, stdout, stderr = self.module.run_command(args, check_rc=False)
|
||||
if rc == 0:
|
||||
return True
|
||||
else:
|
||||
return False
|
||||
return rc == 0
|
||||
|
||||
def _has_dbus_interface(self):
|
||||
"""
|
||||
|
|
@ -607,7 +604,7 @@ class Rhsm:
|
|||
if distro_id == "fedora" and distro_version[0] >= 41:
|
||||
return True
|
||||
# Assume EL distros here.
|
||||
if distro_version[0] >= 10:
|
||||
if distro_version[0] >= 10: # noqa: SIM103
|
||||
return True
|
||||
return False
|
||||
|
||||
|
|
@ -628,7 +625,7 @@ class Rhsm:
|
|||
# if the 2nd part of the version is empty, it means it is
|
||||
# CentOS Stream, and thus we can assume it has the latest
|
||||
# version of subscription-manager.
|
||||
if distro_id == "centos" and (
|
||||
if distro_id == "centos" and ( # noqa: SIM103
|
||||
(distro_version[0] == 8 and (distro_version[1] >= 6 or distro_version_parts[1] == ""))
|
||||
or distro_version[0] >= 9
|
||||
):
|
||||
|
|
@ -662,7 +659,7 @@ class Rhsm:
|
|||
# CentOS: since the change was only done in EL 9, then there is
|
||||
# only CentOS Stream for 9, and thus we can assume it has the
|
||||
# latest version of subscription-manager.
|
||||
if distro_id == "centos" and distro_version[0] >= 9:
|
||||
if distro_id == "centos" and distro_version[0] >= 9: # noqa: SIM103
|
||||
return True
|
||||
# Unknown or old distro: assume it does not support
|
||||
# the new option.
|
||||
|
|
@ -695,7 +692,7 @@ class Rhsm:
|
|||
# if the 2nd part of the version is empty, it means it is
|
||||
# CentOS Stream, and thus we can assume it has the latest
|
||||
# version of subscription-manager.
|
||||
if distro_id == "centos" and (
|
||||
if distro_id == "centos" and ( # noqa: SIM103
|
||||
(distro_version[0] == 8 and (distro_version[1] >= 6 or distro_version_parts[1] == ""))
|
||||
or distro_version[0] >= 9
|
||||
):
|
||||
|
|
@ -909,10 +906,7 @@ class RhsmPool:
|
|||
def subscribe(self):
|
||||
args = f"subscription-manager attach --pool {self.get_pool_id()}"
|
||||
rc, stdout, stderr = self.module.run_command(args, check_rc=True)
|
||||
if rc == 0:
|
||||
return True
|
||||
else:
|
||||
return False
|
||||
return rc == 0
|
||||
|
||||
|
||||
class RhsmPools:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue