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

Merge pull request #37589 from dmurphy18/fix_rpmbuild

Browse Source 
Update parameter for building with mock for rpms
This commit is contained in:
Mike Place 2016-11-10 11:09:48 +13:00 committed by GitHub
commit 6b0a29f6d6
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
salt/modules/rpmbuild.py
View File

@ -156,7 +156,7 @@ def _get_deps(deps, tree_base, saltenv='base'):
else:
shutil.copy(deprpm, dest)
deps_list += ' --install {0}'.format(dest)
deps_list += ' {0}'.format(dest)
return deps_list
@ -250,9 +250,10 @@ def build(runas,
__salt__['cmd.run']('chown {0} -R {1}'.format(runas, results_dir))
cmd = 'mock --root={0} --resultdir={1} --init'.format(tgt, results_dir)
__salt__['cmd.run'](cmd, runas=runas)
if deps_list:
if deps_list and not deps_list.isspace():
cmd = 'mock --root={0} --resultdir={1} --install {2} {3}'.format(tgt, results_dir, deps_list, noclean)
__salt__['cmd.run'](cmd, runas=runas)
noclean += ' --no-clean'
cmd = 'mock --root={0} --resultdir={1} {2} {3} {4}'.format(
tgt,