Merge pull request #36914 from rallytime/suse_show_link

Allow alternatives.show_link function to work on Suse distros
This commit is contained in:
C. R. Oldham 2016-10-12 13:09:33 -06:00 committed by GitHub
commit 2ccc44f314

View file

@ -76,9 +76,14 @@ def show_link(name):
salt '*' alternatives.show_link editor
'''
path = '/var/lib/dpkg/alternatives/{0}'.format(name)
if _get_cmd() == 'alternatives':
path = '/var/lib/alternatives/{0}'.format(name)
if __grains__['os_family'] == 'RedHat':
path = '/var/lib/'
elif __grains__['os_family'] == 'Suse':
path = '/var/lib/rpm/'
else:
path = '/var/lib/dpkg/'
path += 'alternatives/{0}'.format(name)
try:
with salt.utils.fopen(path, 'rb') as r_file: