Skip to content
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

Deb822 default sources list d #4437

Merged
merged 10 commits into from
Sep 27, 2023
Merged

Deb822 default sources list d #4437

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5cbf17d
features: add APT_DEB822_SOURCE_LIST_FILE allowing deb822 sources
blackboxsw Sep 12, 2023
0af28d3
apt_configure: add deb822 support for default sources file
blackboxsw Sep 12, 2023
fda98cc
apt: Add deb822 format support for disable_suites in user-data
blackboxsw Sep 12, 2023
39c5c06
make python apt_pkg a recommends instead of strict dependency
blackboxsw Sep 14, 2023
383193d
integration tests: exercise deb822 feature in test_apt
blackboxsw Sep 15, 2023
203d04f
docs: apt_configure represent deb822 sources behavior and example
blackboxsw Sep 15, 2023
c7ac464
drop unneeded target check
blackboxsw Sep 23, 2023
b56fb0c
apt: call apk_pkg.init_config to initialize before queries
blackboxsw Sep 23, 2023
64b095b
apt: is_deb822_sources_format explicitly check APT sources files
blackboxsw Sep 25, 2023
38cfd5d
refactor get_apt_cfg and DEFAULT_APT_CFG to avoid conditionals
blackboxsw Sep 25, 2023
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
43 changes: 26 additions & 17 deletions cloudinit/config/cc_apt_configure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,8 +575,9 @@ def is_deb822_sources_format(apt_src_content: str) -> bool:


DEFAULT_APT_CFG = {
"sourcelist": "/etc/apt/sources.list",
"sourceparts": "/etc/apt/sources.list.d/",
"Dir::Etc": "etc/apt",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Refactoring code that hasn't landed yet adds churn / noise in the commit log. To avoid this, please squash the changes in this commit into the commit that introduced these lines of code prior to merging.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes agreed on this point, which had prompted my overall squash merge for this PR given some of the overlap and churn I had introduced when handling review comments and iterations. I left these separate commits in a less than desirable state after handling initial reviews which made separate commits for this effort a bit more work than I wanted to spend on this particular PR.

"Dir::Etc::sourcelist": "sources.list",
"Dir::Etc::sourceparts": "sources.list.d",
}

APT_CFG_RE = (
Expand All @@ -596,31 +597,39 @@ def get_apt_cfg() -> Dict[str, str]:
import apt_pkg # type: ignore
TheRealFalcon marked this conversation as resolved.
Show resolved Hide resolved

apt_pkg.init_config()
sourcelist = apt_pkg.config.find_file(
"Dir::Etc::sourcelist", DEFAULT_APT_CFG["sourcelist"]
etc = apt_pkg.config.get("Dir::Etc", DEFAULT_APT_CFG["Dir::Etc"])
sourcelist = apt_pkg.config.get(
"Dir::Etc::sourcelist", DEFAULT_APT_CFG["Dir::Etc::sourcelist"]
)
sourceparts = apt_pkg.config.find_dir(
"Dir::Etc::sourceparts", DEFAULT_APT_CFG["sourceparts"]
sourceparts = apt_pkg.config.get(
"Dir::Etc::sourceparts", DEFAULT_APT_CFG["Dir::Etc::sourceparts"]
)
except ImportError:

try:
apt_dump, _ = subp.subp(["apt-config", "dump"])
except subp.ProcessExecutionError:
# No apt-config, return defaults
return DEFAULT_APT_CFG
etc = DEFAULT_APT_CFG["Dir::Etc"]
sourcelist = DEFAULT_APT_CFG["Dir::Etc::sourcelist"]
sourceparts = DEFAULT_APT_CFG["Dir::Etc::sourceparts"]
return {
"sourcelist": f"/{etc}/{sourcelist}",
"sourceparts": f"/{etc}/{sourceparts}/",
}
matched_cfg = re.findall(APT_CFG_RE, apt_dump)
apt_cmd_config = dict(matched_cfg)
etc = apt_cmd_config.get("Dir::Etc", "etc/apt")
if apt_cmd_config.get("Dir::Etc::sourcelist"):
sourcelist = f"/{etc}/{apt_cmd_config['Dir::Etc::sourcelist']}"
else:
sourcelist = DEFAULT_APT_CFG["sourcelist"]
if apt_cmd_config.get("Dir::Etc::sourceparts"):
sourceparts = f"/{etc}/{apt_cmd_config['Dir::Etc::sourceparts']}/"
else:
sourceparts = DEFAULT_APT_CFG["sourceparts"]
return {"sourcelist": sourcelist, "sourceparts": sourceparts}
etc = apt_cmd_config.get("Dir::Etc", DEFAULT_APT_CFG["Dir::Etc"])
sourcelist = apt_cmd_config.get(
"Dir::Etc::sourcelist", DEFAULT_APT_CFG["Dir::Etc::sourcelist"]
)
sourceparts = apt_cmd_config.get(
"Dir::Etc::sourceparts", DEFAULT_APT_CFG["Dir::Etc::sourceparts"]
)
return {
"sourcelist": f"/{etc}/{sourcelist}",
"sourceparts": f"/{etc}/{sourceparts}/",
}


def generate_sources_list(cfg, release, mirrors, cloud):
Expand Down