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 #35197 from vutny/pkgbuild-repo-failure-detection

Browse source 
Make `pkgbuild.repo` state recognize `createrepo` command return code
This commit is contained in:
Mike Place 2016-08-07 08:20:47 +09:00 • committed by GitHub
commit d3f2ce2a1a
2 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/modules/rpmbuild.py
View file

@ -466,4 +466,4 @@ def make_repo(repodir, keyid=None, env=None, use_passphrase=False, gnupghome='/e
proc.close(terminate=True, kill=True)
cmd = 'createrepo --update {0}'.format(repodir)
__salt__['cmd.run'](cmd, runas=runas)
return __salt__['cmd.run_all'](cmd, runas=runas)

18
salt/states/pkgbuild.py
View file

@ -346,7 +346,7 @@ def repo(name,
if __opts__['test'] is True:
ret['result'] = None
ret['comment'] = 'Package repo at {0} will be rebuilt'.format(name)
ret['comment'] = 'Package repo metadata at {0} will be refreshed'.format(name)
return ret
# Need the check for None here, if env is not provided then it falls back
@ -363,6 +363,18 @@ def repo(name,
func = 'rpmbuild.make_repo'
break
__salt__[func](name, keyid, env, use_passphrase, gnupghome, runas)
ret['changes'] = {'refresh': True}
res = __salt__[func](name, keyid, env, use_passphrase, gnupghome, runas)
if res['retcode'] > 0:
ret['result'] = False
else:
ret['changes'] = {'refresh': True}
if res['stdout'] and res['stderr']:
ret['comment'] = "{0}\n{1}".format(res['stdout'], res['stderr'])
elif res['stdout']:
ret['comment'] = res['stdout']
elif res['stderr']:
ret['comment'] = res['stderr']
return ret