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

Merge pull request #34833 from rallytime/bp-28521

Browse source 
Back-port #28521 to 2015.8
This commit is contained in:
Mike Place 2016-07-21 08:37:24 -06:00 • committed by GitHub
commit b375720251
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
salt/spm/__init__.py
View file

@ -622,12 +622,11 @@ class SPMClient(object):
formula_tar = tarfile.open(out_path, 'w:bz2')
# Add FORMULA first, to speed up create_repo on large packages
formula_tar.add(formula_path, formula_conf['name'], filter=self._exclude)
try:
formula_tar.add(formula_path, formula_conf['name'], filter=self._exclude)
formula_tar.add(self.abspath, formula_conf['name'], filter=self._exclude)
except TypeError:
formula_tar.add(formula_path, formula_conf['name'], exclude=self._exclude)
formula_tar.add(self.abspath, formula_conf['name'], exclude=self._exclude)
formula_tar.close()