diff options
| author | Laurent Bonnans <laurent.bonnans@here.com> | 2019-11-11 17:26:26 +0100 |
|---|---|---|
| committer | Laurent Bonnans <laurent.bonnans@here.com> | 2019-11-11 17:26:26 +0100 |
| commit | 82c41c269eccb87c297de0199f8d996f7da3866d (patch) | |
| tree | 42eda948b04b0e369d861dbb5dc5cf94bd44096c | |
| parent | e2d78039bc847ad6230caa0fe1b4658e7e9690b2 (diff) | |
| download | meta-updater-82c41c269eccb87c297de0199f8d996f7da3866d.tar.gz | |
Only push repo manifest if garage-push supports it
Signed-off-by: Laurent Bonnans <laurent.bonnans@here.com>
| -rw-r--r-- | classes/image_types_ostree.bbclass | 3 |
1 files changed, 2 insertions, 1 deletions
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 | |||
| 188 | IMAGE_CMD_ostreepush () { | 188 | IMAGE_CMD_ostreepush () { |
| 189 | # send a copy of the repo manifest to backend if available | 189 | # send a copy of the repo manifest to backend if available |
| 190 | local SEND_MANIFEST="" | 190 | local SEND_MANIFEST="" |
| 191 | if [ -f ${IMAGE_ROOTFS}${sysconfdir}/manifest.xml ]; then | 191 | # check if garage-push supports the --repo-manifest option before trying |
| 192 | if $(garage-push --help | grep -q '^\s*--repo-manifest') && [ -f ${IMAGE_ROOTFS}${sysconfdir}/manifest.xml ]; then | ||
| 192 | SEND_MANIFEST="--repo-manifest ${IMAGE_ROOTFS}${sysconfdir}/manifest.xml" | 193 | SEND_MANIFEST="--repo-manifest ${IMAGE_ROOTFS}${sysconfdir}/manifest.xml" |
| 193 | fi | 194 | fi |
| 194 | 195 | ||