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

Fixes #56832: Remove warning when falling back to apt-get if aptitude is missing. (#61782)

Browse source
This commit is contained in:
Jeff Geerling 2019-09-12 14:29:36 -05:00 committed by Sam Doran
parent 606e13919e
commit a6ec6c3175
3 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/56832-remove-aptitude-warning.yml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- Remove the unnecessary warning about aptitude not being installed (https://github.com/ansible/ansible/issues/56832).

1
lib/ansible/modules/packaging/os/apt.py
View file

@ -1077,7 +1077,6 @@ def main():
use_apt_get = p['force_apt_get'] use_apt_get = p['force_apt_get']
if not use_apt_get and not APTITUDE_CMD: if not use_apt_get and not APTITUDE_CMD:
module.warn("Could not find aptitude. Using apt-get instead")
use_apt_get = True use_apt_get = True
updated_cache = False updated_cache = False

8
test/integration/targets/apt/tasks/upgrade.yml
View file

@ -35,14 +35,6 @@
when: when:
- force_apt_get - force_apt_get
- name: check that warning is given when aptitude not found and force_apt_get not set
assert:
that:
- "'Could not find aptitude. Using apt-get instead' in upgrade_result.warnings[0]"
when:
- not aptitude_present
- not force_apt_get
- name: check that old version upgraded correctly - name: check that old version upgraded correctly
assert: assert:
that: that: