valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Ensure aptpkg._consolidate_repo strips trailing slashes from repo_uri

Browse Source 
This fixes #18909
This commit is contained in:
Wolodja Wentland 2014-12-11 17:12:23 +00:00
parent fad56f7026
commit 17bfcdbba2
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
salt/modules/aptpkg.py
View File

@ -1143,6 +1143,7 @@ def _consolidate_repo_sources(sources):
repos = [s for s in sources.list if not s.invalid]
for repo in repos:
repo.uri = repo.uri.rstrip('/')
key = str((getattr(repo, 'architectures', []),
repo.disabled, repo.type, repo.uri))
if key in consolidated:
@ -1150,7 +1151,7 @@ def _consolidate_repo_sources(sources):
combined_comps = set(repo.comps).union(set(combined.comps))
consolidated[key].comps = list(combined_comps)
else:
consolidated[key] = sourceslist.SourceEntry(repo.line)
consolidated[key] = sourceslist.SourceEntry(_strip_uri(repo.line))
if repo.file != base_file:
delete_files.add(repo.file)