[Merge] ~mwhudson/livecd-rootfs/+git/livecd-rootfs:cpc-file-list into livecd-rootfs:ubuntu/master

Colin Watson cjwatson at canonical.com
Wed Nov 13 11:48:25 UTC 2019



Diff comments:

> diff --git a/live-build/functions b/live-build/functions
> index c5a6344..2fdcbe9 100644
> --- a/live-build/functions
> +++ b/live-build/functions
> @@ -51,6 +51,11 @@ create_manifest() {
>      echo "create_manifest call to dpkg-query finished."
>      ./config/snap-seed-parse "${chroot_root}" "${target_file}"
>      echo "create_manifest call to snap_seed_parse finished."
> +    if [ "$PROJECT" = ubuntu-cpc ]; then
> +        echo "create_manifest creating file listing."
> +        local target_filelist=${2/.manifest}.filelist

Alternatively, perhaps ${2%.manifest} was meant here rather than ${2/.manifest}; the former is in POSIX (https://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html#tag_18_06_02) while the latter is a bashism.  (${2%.manifest} expands to $2 with ".manifest" removed from the end, while %{2/.manifest} expands to $2 with the first occurrence of ".manifest" removed.)

("local" is not in POSIX, but policy specifically requires it of all shells: https://www.debian.org/doc/debian-policy/ch-files.html#scripts).

> +        (cd "${chroot_root}" && find) > "${target_filelist}"
> +    fi
>      echo "create_manifest finished"
>  }
>  


-- 
https://code.launchpad.net/~mwhudson/livecd-rootfs/+git/livecd-rootfs/+merge/374332
Your team Ubuntu Core Development Team is subscribed to branch livecd-rootfs:ubuntu/master.



More information about the Ubuntu-reviews mailing list