cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix mistaken detection of atomic_container when rpm-ostree is present (fixes #74578) (#74579)

Browse source 
* Lower the priority of the atomic_container detection now that we have #73445 merged

* Add changelog fragment
This commit is contained in:
Alex Haydock 2021-05-19 21:15:26 +01:00 committed by GitHub
parent d2d1f01f9d
commit 724a0c867e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/74578-fix-ostree-detection.yml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- pkg_mgr.py - Lower the priority of rpm-ostree detection to avoid false positives on systems not using it as the main package manager (https://github.com/ansible/ansible/issues/74578)

4
lib/ansible/module_utils/facts/system/pkg_mgr.py
View file

@ -13,7 +13,8 @@ from ansible.module_utils.facts.collector import BaseFactCollector
# A list of dicts. If there is a platform with more than one # A list of dicts. If there is a platform with more than one
# package manager, put the preferred one last. If there is an # package manager, put the preferred one last. If there is an
# ansible module, use that as the value for the 'name' key. # ansible module, use that as the value for the 'name' key.
PKG_MGRS = [{'path': '/usr/bin/yum', 'name': 'yum'}, PKG_MGRS = [{'path': '/usr/bin/rpm-ostree', 'name': 'atomic_container'},
{'path': '/usr/bin/yum', 'name': 'yum'},
{'path': '/usr/bin/dnf', 'name': 'dnf'}, {'path': '/usr/bin/dnf', 'name': 'dnf'},
{'path': '/usr/bin/apt-get', 'name': 'apt'}, {'path': '/usr/bin/apt-get', 'name': 'apt'},
{'path': '/usr/bin/zypper', 'name': 'zypper'}, {'path': '/usr/bin/zypper', 'name': 'zypper'},
@ -36,7 +37,6 @@ PKG_MGRS = [{'path': '/usr/bin/yum', 'name': 'yum'},
{'path': '/usr/local/sbin/pkg', 'name': 'pkgng'}, {'path': '/usr/local/sbin/pkg', 'name': 'pkgng'},
{'path': '/usr/bin/swupd', 'name': 'swupd'}, {'path': '/usr/bin/swupd', 'name': 'swupd'},
{'path': '/usr/sbin/sorcery', 'name': 'sorcery'}, {'path': '/usr/sbin/sorcery', 'name': 'sorcery'},
{'path': '/usr/bin/rpm-ostree', 'name': 'atomic_container'},
{'path': '/usr/bin/installp', 'name': 'installp'}, {'path': '/usr/bin/installp', 'name': 'installp'},
{'path': '/QOpenSys/pkgs/bin/yum', 'name': 'yum'}, {'path': '/QOpenSys/pkgs/bin/yum', 'name': 'yum'},
] ]