valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

another fix of issue #2111

Browse Source 
on Debian wheezy, salt-call -g |grep os_family
gives:
   os_family: debian

Which means that apt will not be used
(it checks os_family for 'Debian').

so i added  debian -> Debian into _OS_FAMILY_MAP

... this patch also contains 2 little pep8  fixes
This commit is contained in:
David Pravec 2012-12-17 18:13:17 +01:00
parent e6b247ad12
commit 826e7e4d66
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/grains/core.py
View File

@ -390,6 +390,7 @@ def _ps(osdata):
grains['ps'] = 'ps -efH'
return grains
def _windows_platform_data(osdata):
'''
Use the platform module for as much as we can.
@ -457,6 +458,7 @@ _OS_NAME_MAP = {
# Map the 'os' grain to the 'os_family' grain
_OS_FAMILY_MAP = {
'debian': 'Debian',
'Ubuntu': 'Debian',
'Fedora': 'RedHat',
'CentOS': 'RedHat',
@ -555,7 +557,7 @@ def os_data():
grains['lsb_distrib_id'] = value.strip()
# Use the already intelligent platform module to get distro info
(osname, osrelease, oscodename) = platform.linux_distribution(
supported_dists=_supported_dists)
supported_dists=_supported_dists)
# Try to assign these three names based on the lsb info, they tend to
# be more accurate than what python gets from /etc/DISTRO-release.
# It's worth noting that Ubuntu has patched their Python distribution