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

Fix prev feature commit, Do not require aptitude to use apt commands in the apt module, only needed when upgrading.

Browse source
This commit is contained in:
Michael DeHaan 2013-07-22 15:15:55 -04:00
parent adda77a42b
commit 7bfc24706c
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
packaging/apt
View file

@ -233,6 +233,8 @@ def upgrade(m, mode="yes", force=False):
check_arg = '--simulate' check_arg = '--simulate'
else: else:
check_arg = '' check_arg = ''
apt_cmd = None
if mode == "dist": if mode == "dist":
# apt-get dist-upgrade # apt-get dist-upgrade
apt_cmd = APT_GET_CMD apt_cmd = APT_GET_CMD
@ -291,10 +293,10 @@ def main():
global APT_GET_CMD global APT_GET_CMD
APT_GET_CMD = module.get_bin_path("apt-get") APT_GET_CMD = module.get_bin_path("apt-get")
if not APTITUDE_CMD: p = module.params
if not APTITUDE_CMD and p.get('upgrade', None) in [ 'full', 'safe', 'yes' ]:
module.fail_json(msg="Could not find aptitude. Please ensure it is installed.") module.fail_json(msg="Could not find aptitude. Please ensure it is installed.")
p = module.params
install_recommends = p['install_recommends'] install_recommends = p['install_recommends']
try: try: