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

Merge pull request #31093 from techhat/spmfix

Browse Source 
Ensure double directories don't get created
This commit is contained in:
Mike Place 2016-02-10 11:53:47 -07:00
commit 94fa76831f
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/spm/pkgfiles/local.py
View File

@ -106,6 +106,12 @@ def install_file(package, formula_tar, member, formula_def, conn=None):
# Reactor files go into /srv/reactor/ # Reactor files go into /srv/reactor/
out_path = __opts__['reactor_path'] out_path = __opts__['reactor_path']
# This ensures that double directories (i.e., apache/apache/) don't
# get created
comps = member.path.split('/')
if len(comps) > 1 and comps[0] == comps[1]:
member.path = '/'.join(comps[1:])
log.debug('Installing package file {0} to {1}'.format(member.name, out_path)) log.debug('Installing package file {0} to {1}'.format(member.name, out_path))
formula_tar.extract(member, out_path) formula_tar.extract(member, out_path)