Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2026-02-14 05:53:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename the Daily|Release in .disk/info from "official" to "iso_status"

Browse Source
This commit is contained in:
michael.hudson@canonical.com 2026-02-11 06:28:12 +13:00
parent 2c2f7d5e5c
commit 84760de4da
No known key found for this signature in database
GPG Key ID: 80E627A0AB757E23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
live-build/auto/config
View File

@ -1700,7 +1700,7 @@ EOF
fi fi
if [ "${MAKE_ISO}" = "yes" ]; then if [ "${MAKE_ISO}" = "yes" ]; then
# XXX should pass --official here. # XXX should pass --iso-status here.
/usr/share/livecd-rootfs/live-build/gen-iso-ids \ /usr/share/livecd-rootfs/live-build/gen-iso-ids \
--project $PROJECT ${SUBPROJECT:+--subproject $SUBPROJECT} \ --project $PROJECT ${SUBPROJECT:+--subproject $SUBPROJECT} \
--arch $ARCH ${SUBARCH:+--subarch $SUBARCH} ${NOW+--serial $NOW} \ --arch $ARCH ${SUBARCH:+--subarch $SUBARCH} ${NOW+--serial $NOW} \

10
live-build/gen-iso-ids
View File

@ -59,7 +59,7 @@ def make_disk_info(
subarch: str, subarch: str,
capproject: str, capproject: str,
subproject: str, subproject: str,
official: str, iso_status: str,
serial: str, serial: str,
) -> str: ) -> str:
# os-release VERSION is _almost_ what goes into .disk/info... # os-release VERSION is _almost_ what goes into .disk/info...
@ -82,7 +82,7 @@ def make_disk_info(
if subarch: if subarch:
fullarch += "+" + subarch fullarch += "+" + subarch
return f"{capproject}{capsubproject} {version} - {official} {fullarch} ({serial})" return f"{capproject}{capsubproject} {version} - {iso_status} {fullarch} ({serial})"
def make_vol_id(os_release: dict[str, str], arch: str, capproject: str) -> str: def make_vol_id(os_release: dict[str, str], arch: str, capproject: str) -> str:
@ -146,7 +146,7 @@ def make_vol_id(os_release: dict[str, str], arch: str, capproject: str) -> str:
default=time.strftime("%Y%m%d"), default=time.strftime("%Y%m%d"),
) )
@click.option( @click.option(
"--official", "--iso-status",
type=str, type=str,
default="Daily", default="Daily",
) )
@ -162,7 +162,7 @@ def main(
arch: str, arch: str,
subarch: str, subarch: str,
serial: str, serial: str,
official: str, iso_status: str,
output_dir: pathlib.Path, output_dir: pathlib.Path,
): ):
output_dir.mkdir(exist_ok=True) output_dir.mkdir(exist_ok=True)
@ -177,7 +177,7 @@ def main(
subarch, subarch,
capproject, capproject,
subproject, subproject,
official, iso_status,
serial, serial,
) )
print(f"disk_info: {disk_info!r}") print(f"disk_info: {disk_info!r}")