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

reorder emerge command line

Browse source 
Fixes #23479.
This commit is contained in:
Justin Findlay 2015-05-11 14:32:31 -06:00
parent e96c5c5bf3
commit 45404fb2a6
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
salt/modules/ebuild.py
View file

@ -396,7 +396,7 @@ def refresh_db():
cmd = 'emerge-delta-webrsync -q'
return __salt__['cmd.retcode'](cmd, python_shell=False) == 0
else:
if __salt__['cmd.retcode']('emerge --sync --ask n --quiet',
if __salt__['cmd.retcode']('emerge --ask n --quiet --sync',
python_shell=False) == 0:
return True
# We fall back to "webrsync" if "rsync" fails for some reason
@ -589,7 +589,7 @@ def install(name=None,
targets.append(target)
else:
targets = pkg_params
cmd = 'emerge --quiet --ask n {0} {1}'.format(emerge_opts, ' '.join(targets))
cmd = 'emerge --ask n --quiet {0} {1}'.format(emerge_opts, ' '.join(targets))
old = list_pkgs()
call = __salt__['cmd.run_all'](cmd,
@ -638,7 +638,7 @@ def update(pkg, slot=None, fromrepo=None, refresh=False):
full_atom = '{0}::{1}'.format(full_atom, fromrepo)
old = list_pkgs()
cmd = 'emerge --update --newuse --oneshot --ask n --quiet {0}'.format(full_atom)
cmd = 'emerge --ask n --quiet --update --newuse --oneshot {0}'.format(full_atom)
call = __salt__['cmd.run_all'](cmd,
output_loglevel='trace',
python_shell=False)
@ -729,7 +729,7 @@ def remove(name=None, slot=None, fromrepo=None, pkgs=None, **kwargs):
if not targets:
return {}
cmd = 'emerge --unmerge --quiet --quiet-unmerge-warn --ask n ' \
cmd = 'emerge --ask n --quiet --unmerge --quiet-unmerge-warn ' \
'{0}'.format(' '.join(targets))
__salt__['cmd.run_all'](cmd,
output_loglevel='trace',
@ -821,7 +821,7 @@ def depclean(name=None, slot=None, fromrepo=None, pkgs=None):
else:
targets = [x for x in pkg_params if x in old]
cmd = 'emerge --depclean --ask n --quiet {0}'.format(' '.join(targets))
cmd = 'emerge --ask n --quiet --depclean {0}'.format(' '.join(targets))
__salt__['cmd.run_all'](cmd,
output_loglevel='trace',
python_shell=False)