saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

pre-commit fix after rebase issues

Browse source
This commit is contained in:
Thomas Phipps 2024-03-15 18:10:26 +00:00 • committed by Thomas Phipps
parent aabba2793a
commit 18cdcfc496
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
salt/modules/aptpkg.py
View file

@ -1678,9 +1678,9 @@ def get_repo(repo, **kwargs):
uri_match = re.search("(http[s]?://)(.+)", repo_entry["uri"]) uri_match = re.search("(http[s]?://)(.+)", repo_entry["uri"])
if uri_match: if uri_match:
if not uri_match.group(2).startswith(ppa_auth): if not uri_match.group(2).startswith(ppa_auth):
repo_entry[ repo_entry["uri"] = (
"uri" f"{uri_match.group(1)}{ppa_auth}@{uri_match.group(2)}"
] = f"{uri_match.group(1)}{ppa_auth}@{uri_match.group(2)}" )
except SyntaxError: except SyntaxError:
raise CommandExecutionError( raise CommandExecutionError(
f"Error: repo '{repo}' is not a well formatted definition" f"Error: repo '{repo}' is not a well formatted definition"
@ -2673,9 +2673,9 @@ def _expand_repo_def(os_name, os_codename=None, **kwargs):
repo = LP_SRC_FORMAT.format(owner_name, ppa_name, dist) repo = LP_SRC_FORMAT.format(owner_name, ppa_name, dist)
if "file" not in kwargs: if "file" not in kwargs:
kwargs[ kwargs["file"] = (
"file" f"/etc/apt/sources.list.d/{owner_name}-{ppa_name}-{dist}.list"
] = f"/etc/apt/sources.list.d/{owner_name}-{ppa_name}-{dist}.list" )
source_entry = SourceEntry(repo) source_entry = SourceEntry(repo)
for list_args in ("architectures", "comps"): for list_args in ("architectures", "comps"):