Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2026-02-12 13:03:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Copy-edit Claude's comments a bit.

Browse Source
This commit is contained in:
michael.hudson@canonical.com 2026-01-15 09:33:02 +13:00
parent 4d8cfd89b8
commit 9a9ca07a76
No known key found for this signature in database
GPG Key ID: 80E627A0AB757E23
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
live-build/isobuilder/apt_state.py
View File

@ -56,8 +56,7 @@ class AptStateManager:
The `fields` set (derived from PackageInfo's dataclass fields) acts as The `fields` set (derived from PackageInfo's dataclass fields) acts as
a filter - we only extract fields we care about, ignoring others like a filter - we only extract fields we care about, ignoring others like
Description. This provides some forward-compatibility if apt-cache Description.
output format changes.
""" """
proc = subprocess.Popen( proc = subprocess.Popen(
["apt-cache", "-o", "APT::Cache::AllVersions=0", "show"] + pkgs, ["apt-cache", "-o", "APT::Cache::AllVersions=0", "show"] + pkgs,

8
live-build/isobuilder/builder.py
View File

@ -252,7 +252,7 @@ class ISOBuilder:
# for-iso.base.squashfs -> base.squashfs # for-iso.base.squashfs -> base.squashfs
# for-iso.kernel-generic -> filesystem.kernel-generic # for-iso.kernel-generic -> filesystem.kernel-generic
# #
# Kernel and initrd get the extra "filesystem." prefix because casper # Kernel and initrd get the extra "filesystem." prefix because debian-cd
# expects names like filesystem.kernel-* and filesystem.initrd-*. # expects names like filesystem.kernel-* and filesystem.initrd-*.
casper_dir = self.iso_root.joinpath("casper") casper_dir = self.iso_root.joinpath("casper")
artifact_dir = artifact_prefix.parent artifact_dir = artifact_prefix.parent
@ -298,8 +298,8 @@ class ISOBuilder:
], ],
) )
# Override apt-selection to use our ISO's apt configuration instead of # Override apt-selection to use our ISO's apt configuration instead of
# debian-cd's default. This ensures the boot scripts query packages from # debian-cd's default. This ensures the boot scripts get packages from
# the correct repository (our pool) when determining boot requirements. # the correct repository when installing boot packages.
apt_selection = debian_cd_dir.joinpath("tools/apt-selection") apt_selection = debian_cd_dir.joinpath("tools/apt-selection")
with self.logger.logged("overwriting apt-selection"): with self.logger.logged("overwriting apt-selection"):
apt_selection.write_text( apt_selection.write_text(
@ -329,7 +329,7 @@ class ISOBuilder:
# - Symlinks are excluded because their targets are already checksummed # - Symlinks are excluded because their targets are already checksummed
# - Files are sorted for deterministic, reproducible output across builds # - Files are sorted for deterministic, reproducible output across builds
# - Paths use "./" prefix and we run md5sum from iso_root so the output # - Paths use "./" prefix and we run md5sum from iso_root so the output
# matches what users get when they verify with "md5sum -c" from the ISO # matches what casper-md5check expects.
all_files = [] all_files = []
for dirpath, dirnames, filenames in self.iso_root.walk(): for dirpath, dirnames, filenames in self.iso_root.walk():
filepaths = [dirpath.joinpath(filename) for filename in filenames] filepaths = [dirpath.joinpath(filename) for filename in filenames]