Skip to content

fix(aptpkg): change glob to only match top-level .list files #68483

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: 3006.x
Choose a base branch
from
+11 −1
Open

fix(aptpkg): change glob to only match top-level .list files #68483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion salt/modules/aptpkg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ def __init__(self):
]
for file in self.files:
if file.is_dir():
for fp in file.glob("**/*.list"):
for fp in file.glob("*.list"):
self.add_file(file=fp)
else:
self.add_file(file)
Expand Down
10 changes: 10 additions & 0 deletions tests/pytests/unit/modules/test_aptpkg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1575,6 +1575,16 @@ def test_sourceslist_multiple_comps():
assert source.dist == "focal-updates"


def test_sourceslist_subdirectory_no_exception(fs):
fs.create_dir("/etc/apt/sources.list.d/backup.list")
fs.create_file(
"/etc/apt/sources.list.d/backup/test.list",
contents="deb http://archive.ubuntu.com/ubuntu/ focal main",
)
sources = aptpkg.SourcesList()
assert list(sources) == []


@pytest.fixture(
params=(
"deb [ arch=amd64 ] http://archive.ubuntu.com/ubuntu/ focal-updates main restricted",
Expand Down