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

apt_repository: check for enabled repositories correctly

Browse source 
Fixes #20754.

Details: UbuntuSourcesList.add_source() had a quick check for PPAs being
already present in the source lists.  The check was looking for the PPAs
URL to be present in self.repo_urls, which should contain all valid and
enabled repositories.

The enabled check in repo_urls was incorrect.  It was checking the tuple's
2nd item (which means "valid") and ignoring the 3rd item (which means
"enabled").

self.files contains tuples (line_number, valid, enabled, source_line,
comment_text).  Ideally it would be using named tuples instead of
indexing, to avoid bugs like that, but Python 2.4 didn't have named
tuples, so we can't do that (yet).
This commit is contained in:
Marius Gedminas 2017-01-27 17:31:07 +02:00 committed by Toshio Kuratomi
parent f16ee2841b
commit 577d0e43ba
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/ansible/modules/packaging/os/apt_repository.py
View file

@ -458,10 +458,11 @@ class UbuntuSourcesList(SourcesList):
_repositories = []
for parsed_repos in self.files.values():
for parsed_repo in parsed_repos:
enabled = parsed_repo[1]
valid = parsed_repo[1]
enabled = parsed_repo[2]
source_line = parsed_repo[3]
if not enabled:
if not valid or not enabled:
continue
if source_line.startswith('ppa:'):