From dee9bf7a66253d782c1cb78ab57990774d00ec3e Mon Sep 17 00:00:00 2001 From: Leon Anavi Date: Thu, 17 Aug 2017 15:46:00 +0300 Subject: Show warnings if credentials are not provided Print warnings if variable SOTA_PACKED_CREDENTIALS is not set or if the specified file does not exist. Signed-off-by: Leon Anavi --- classes/image_types_ostree.bbclass | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass index 6a1b33e..8c9f262 100644 --- a/classes/image_types_ostree.bbclass +++ b/classes/image_types_ostree.bbclass @@ -133,9 +133,11 @@ IMAGE_CMD_ostree () { # deploy SOTA credentials if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then - cp ${SOTA_PACKED_CREDENTIALS} var/sota/sota_provisioning_credentials.zip - # Device should not be able to push data to treehub - zip -d var/sota/sota_provisioning_credentials.zip treehub.json + if [ -e ${SOTA_PACKED_CREDENTIALS} ]; then + cp ${SOTA_PACKED_CREDENTIALS} var/sota/sota_provisioning_credentials.zip + # Device should not be able to push data to treehub + zip -d var/sota/sota_provisioning_credentials.zip treehub.json + fi fi if [ -n "${SOTA_SECONDARY_ECUS}" ]; then @@ -183,10 +185,17 @@ IMAGE_CMD_ostree () { IMAGE_TYPEDEP_ostreepush = "ostree" IMAGE_DEPENDS_ostreepush = "sota-tools-native:do_populate_sysroot" IMAGE_CMD_ostreepush () { + # Print warnings if credetials are not set or if the file has not been found. if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then - garage-push --repo=${OSTREE_REPO} \ - --ref=${OSTREE_BRANCHNAME} \ - --credentials=${SOTA_PACKED_CREDENTIALS} \ - --cacert=${STAGING_ETCDIR_NATIVE}/ssl/certs/ca-certificates.crt + if [ -e ${SOTA_PACKED_CREDENTIALS} ]; then + garage-push --repo=${OSTREE_REPO} \ + --ref=${OSTREE_BRANCHNAME} \ + --credentials=${SOTA_PACKED_CREDENTIALS} \ + --cacert=${STAGING_ETCDIR_NATIVE}/ssl/certs/ca-certificates.crt + else + bbwarn "SOTA_PACKED_CREDENTIALS file does not exist." + fi + else + bbwarn "SOTA_PACKED_CREDENTIALS not set. Please add SOTA_PACKED_CREDENTIALS." fi } -- cgit v1.2.3-54-g00ecf