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

SPM: packaging doesn't work in Python 2.6. Fixed.

Browse source
This commit is contained in:
Gleb Goncharov 2015-11-03 14:18:38 +03:00 • committed by rallytime
parent 98fa4a404e
commit e50a6783ce
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()