mirror of https://github.com/ansible/ansible.git
You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
2149d1092b
Allow empty wasn't breaking out of the process_dist_files
loop, so a empty /etc/arch-release would continue searching
and eventually try /etc/os-release. The os-release parsing
works, but the distro name there is 'Arch Linux' which does
not match the 2.3 behavior of 'Archlinux'
Add a OS_RELEASE_ALIAS map for the cases where we need to get
the distro name from os-release but use an alias.
We can't include 'Archlinux' in SEARCH_STRING because a name match on its keys
but without a match on the content causes a fallback to using the first
whitespace seperated item from the file content as the name.
For os-release, that is in form 'NAME=Arch Linux'
With os-release returning the right name, this also supports the
case where there is no /etc/arch-release, but there is a /etc/os-release
Fixes #30600
* pep8 and comment cleanup
(cherry picked from commit
|
8 years ago | |
|---|---|---|
| .. | ||
| cli | 8 years ago | |
| contrib | 9 years ago | |
| errors | 9 years ago | |
| executor | 9 years ago | |
| inventory | 9 years ago | |
| inventory_test_data/group_vars | 11 years ago | |
| mock | 9 years ago | |
| module_utils | 8 years ago | |
| modules | 8 years ago | |
| parsing | 8 years ago | |
| playbook | 8 years ago | |
| plugins | 8 years ago | |
| template | 9 years ago | |
| utils | 9 years ago | |
| vars | 8 years ago | |
| __init__.py | 9 years ago | |
| conftest.py | 9 years ago | |
| test_constants.py | 9 years ago | |