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 #25044 from thatch45/rpmbuild_fix

Browse Source 
Rpmbuild fix
This commit is contained in:
Thomas S Hatch 2015-06-29 13:05:21 -07:00
commit 824cc34a0e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/modules/rpmbuild.py
View File

@ -50,7 +50,7 @@ def _get_spec(tree_base, spec, template, saltenv='base'):
''' '''
spec_tgt = os.path.basename(spec) spec_tgt = os.path.basename(spec)
dest = os.path.join(tree_base, 'SPECS', spec_tgt) dest = os.path.join(tree_base, 'SPECS', spec_tgt)
return __salt__['cp.get_file']( return __salt__['cp.get_url'](
spec, spec,
dest, dest,
saltenv=saltenv, saltenv=saltenv,
@ -65,7 +65,7 @@ def _get_src(tree_base, source, saltenv='base'):
sbase = os.path.basename(source) sbase = os.path.basename(source)
dest = os.path.join(tree_base, 'SOURCES', sbase) dest = os.path.join(tree_base, 'SOURCES', sbase)
if parsed.scheme: if parsed.scheme:
lsrc = __salt__['cp.get_file'](source, dest, saltenv=saltenv) lsrc = __salt__['cp.get_url'](source, dest, saltenv=saltenv)
else: else:
shutil.copy(source, dest) shutil.copy(source, dest)