saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix broken install of additionnal modules in SPM packages

Browse source 
Fixes #44554
This commit is contained in:
Nicolas Chancereul 2018-10-24 18:44:46 +02:00
parent 85e22d2f25
commit 9b203d544d
No known key found for this signature in database
GPG key ID: 8D9DC409FB9C9530
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/spm/pkgfiles/local.py
View file

@ -129,7 +129,7 @@ def install_file(package, formula_tar, member, formula_def, conn=None):
elif tag in ('s', 'm'):
pass
if new_name.startswith('{0}/_'.format(package)):
if member.name.startswith('{0}/_'.format(package)):
if node_type in ('master', 'minion'):
# Module files are distributed via extmods directory
member.name = member.name.replace('{0}/_'.format(package), '')
@ -141,7 +141,7 @@ def install_file(package, formula_tar, member, formula_def, conn=None):
else:
# Module files are distributed via _modules, _states, etc
member.name = member.name.replace('{0}/'.format(package), '')
elif new_name == '{0}/pillar.example'.format(package):
elif member.name == '{0}/pillar.example'.format(package):
# Pillars are automatically put in the pillar_path
member.name = '{0}.sls.orig'.format(package)
out_path = conn['pillar_path']