Merge pull request #711 from conrado/apt-builddep

fixed: namespace clash #710
reviewable/pr18780/r1
Toshio Kuratomi 10 years ago
commit 26cd1a2d9a

@ -607,17 +607,17 @@ def main():
module.fail_json(msg='version number inconsistent with state=latest: %s' % package) module.fail_json(msg='version number inconsistent with state=latest: %s' % package)
if p['state'] in ('latest', 'present', 'build-dep'): if p['state'] in ('latest', 'present', 'build-dep'):
upgrade = False state_upgrade = False
build_dep = False state_builddep = False
if p['state'] == 'latest': if p['state'] == 'latest':
upgrade = True state_upgrade = True
if p['state'] == 'build-dep': if p['state'] == 'build-dep':
build_dep = True state_builddep = True
result = install(module, packages, cache, upgrade=upgrade, result = install(module, packages, cache, upgrade=state_upgrade,
default_release=p['default_release'], default_release=p['default_release'],
install_recommends=install_recommends, install_recommends=install_recommends,
force=force_yes, dpkg_options=dpkg_options, force=force_yes, dpkg_options=dpkg_options,
build_dep=build_dep) build_dep=state_builddep)
(success, retvals) = result (success, retvals) = result
if success: if success:
module.exit_json(**retvals) module.exit_json(**retvals)

Loading…
Cancel
Save