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

Merge pull request #27827 from techhat/spmfixes

Browse Source 
Add additional error checking to SPM
This commit is contained in:
Colton Myers 2015-10-09 12:23:09 -06:00
commit 4a69db27cd
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
salt/spm/__init__.py
View File

@ -569,7 +569,10 @@ class SPMClient(object):
self.formula_conf = formula_conf
formula_tar = tarfile.open(out_path, 'w:bz2')
formula_tar.add(self.abspath, formula_conf['name'], filter=self._exclude)
try:
formula_tar.add(self.abspath, formula_conf['name'], filter=self._exclude)
except TypeError:
formula_tar.add(self.abspath, formula_conf['name'], exclude=self._exclude)
formula_tar.close()
self.ui.status('Built package {0}'.format(out_path))
@ -578,6 +581,9 @@ class SPMClient(object):
'''
Exclude based on opts
'''
if isinstance(member, string_types):
return None
for item in self.opts['spm_build_exclude']:
if member.name.startswith('{0}/{1}'.format(self.formula_conf['name'], item)):
return None

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

@ -127,6 +127,9 @@ def hash_file(path, hashobj, conn=None):
'''
Get the hexdigest hash value of a file
'''
if os.path.isdir(path):
return ''
with salt.utils.fopen(path, 'r') as f:
hashobj.update(f.read())
return hashobj.hexdigest()