Ack'd.

This makes sense regardless of the other patches I'm doing more tests with.

This will be staged shortly.

Bruce

On Mon, Oct 16, 2023 at 5:08 PM Joshua Watt <jpewhac...@gmail.com> wrote:
>
> Quote the label argument passed to umoci to allow it to correctly handle
> spaces. Note that this requires that OCI_IMAGE_LABELS have the argument
> quoted with single quotes, as in:
>
>     OCI_IMAGE_LABELS = "org.opencontainers.image.description='${SUMMARY}'"
>
> Signed-off-by: Joshua Watt <jpewhac...@gmail.com>
> ---
>  classes/image-oci-umoci.inc | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/classes/image-oci-umoci.inc b/classes/image-oci-umoci.inc
> index 58e4668..333c816 100644
> --- a/classes/image-oci-umoci.inc
> +++ b/classes/image-oci-umoci.inc
> @@ -58,8 +58,8 @@ IMAGE_CMD:oci() {
>      bbdebug 1 "OCI: configuring image"
>      if [ -n "${OCI_IMAGE_LABELS}" ]; then
>         for l in ${OCI_IMAGE_LABELS}; do
> -           bbdebug 1 "OCI: umoci config --image $image_name:${OCI_IMAGE_TAG} 
> --config.label $l"
> -           umoci config --image $image_name:${OCI_IMAGE_TAG} --config.label 
> $l
> +           bbdebug 1 "OCI: umoci config --image $image_name:${OCI_IMAGE_TAG} 
> --config.label \"$l\""
> +           umoci config --image $image_name:${OCI_IMAGE_TAG} --config.label 
> "$l"
>         done
>      fi
>      if [ -n "${OCI_IMAGE_ENV_VARS}" ]; then
> --
> 2.34.1
>
>
> 
>


-- 
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#8391): 
https://lists.yoctoproject.org/g/meta-virtualization/message/8391
Mute This Topic: https://lists.yoctoproject.org/mt/102005707/21656
Group Owner: meta-virtualization+ow...@lists.yoctoproject.org
Unsubscribe: 
https://lists.yoctoproject.org/g/meta-virtualization/leave/6693005/21656/1014668956/xyzzy
 [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to