cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #631 from Tatsh-ansible/usepkg-flags

Browse source 
Portage: --usepkg and --usepkgonly flags, --usepkgonly should not imply --getbinpkg
This commit is contained in:
Greg DeKoenigsberg 2015-06-23 13:35:27 -04:00
commit 03bb12c90f
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
packaging/os/portage.py
View file

@ -271,14 +271,14 @@ def emerge_packages(module, packages):
'verbose': '--verbose', 'verbose': '--verbose',
'getbinpkg': '--getbinpkg', 'getbinpkg': '--getbinpkg',
'usepkgonly': '--usepkgonly', 'usepkgonly': '--usepkgonly',
'usepkg': '--usepkg',
} }
for flag, arg in emerge_flags.iteritems(): for flag, arg in emerge_flags.iteritems():
if p[flag]: if p[flag]:
args.append(arg) args.append(arg)
# usepkgonly implies getbinpkg if p['usepkg'] and p['usepkgonly']:
if p['usepkgonly'] and not p['getbinpkg']: module.fail_json(msg='Use only one of usepkg, usepkgonly')
args.append('--getbinpkg')
cmd, (rc, out, err) = run_emerge(module, packages, *args) cmd, (rc, out, err) = run_emerge(module, packages, *args)
if rc != 0: if rc != 0:
@ -415,6 +415,7 @@ def main():
sync=dict(default=None, choices=['yes', 'web']), sync=dict(default=None, choices=['yes', 'web']),
getbinpkg=dict(default=None, choices=['yes']), getbinpkg=dict(default=None, choices=['yes']),
usepkgonly=dict(default=None, choices=['yes']), usepkgonly=dict(default=None, choices=['yes']),
usepkg=dict(default=None, choices=['yes']),
), ),
required_one_of=[['package', 'sync', 'depclean']], required_one_of=[['package', 'sync', 'depclean']],
mutually_exclusive=[['nodeps', 'onlydeps'], ['quiet', 'verbose']], mutually_exclusive=[['nodeps', 'onlydeps'], ['quiet', 'verbose']],