mirror of https://github.com/ansible/ansible.git
Fix ansible_distribution on Ubuntu 10.04 (#31108)
The /etc/os-release based distro detection doesn't seem to work for Ubuntu 10.04 (no /etc/os-release?). So it was testing the next case which was /etc/lsb-release to see if it is 'Mandriva'. Since the check for existence of (/etc/lsb-release, Mandrive) was the first non-empty dist file match, 'ansible_distribution' was being set to 'Mandriva' expecting to be corrected by the data from the dist file content. But since the dist file parsing for Mandriva didn't match for Ubuntu 10.04 /etc/lsb-release _and_ there is no Debian specific lsb-release check, 'ansible_distribution' stayed at 'Mandriva' and the dist file checking loop keeps going and eventually off the end of the list before finding a better match. Adding a debian/ubuntu specific check for /etc/lsb-release after the debian os-release sets the info correctly and stops further checking of dist files. Fixes #30693pull/31261/head
parent
6caac2743a
commit
65393e4747
Loading…
Reference in New Issue