From 82c41c269eccb87c297de0199f8d996f7da3866d Mon Sep 17 00:00:00 2001 From: Laurent Bonnans Date: Mon, 11 Nov 2019 17:26:26 +0100 Subject: Only push repo manifest if garage-push supports it Signed-off-by: Laurent Bonnans --- classes/image_types_ostree.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass index f10e523..0f0fd28 100644 --- a/classes/image_types_ostree.bbclass +++ b/classes/image_types_ostree.bbclass @@ -188,7 +188,8 @@ do_image_ostreepush[depends] += "aktualizr-native:do_populate_sysroot ca-certifi IMAGE_CMD_ostreepush () { # send a copy of the repo manifest to backend if available local SEND_MANIFEST="" - if [ -f ${IMAGE_ROOTFS}${sysconfdir}/manifest.xml ]; then + # check if garage-push supports the --repo-manifest option before trying + if $(garage-push --help | grep -q '^\s*--repo-manifest') && [ -f ${IMAGE_ROOTFS}${sysconfdir}/manifest.xml ]; then SEND_MANIFEST="--repo-manifest ${IMAGE_ROOTFS}${sysconfdir}/manifest.xml" fi -- cgit v1.2.3-54-g00ecf