On Mon, Jun 28, 2021 at 08:38:25AM +0200, Michael Olbrich wrote: > On Mon, Jun 28, 2021 at 01:11:15AM +0200, Roland Hieber wrote: > > From: Marc Kleine-Budde <m...@pengutronix.de> > > > > This patch changes cs_get_ca() to only output the CA if it actually > > exists, or print an error and return 1 instead. This makes it possible > > to use make's $(if $(filter-out, ERROR_CA_NOT_YET_SET, ...)) > > conditional. > > > > Co-authored-by: Roland Hieber <r...@pengutronix.de> > > Signed-off-by: Marc Kleine-Budde <m...@pengutronix.de> > > Signed-off-by: Roland Hieber <r...@pengutronix.de> > > --- > > PATCH v2 (rhi): > > - reorder from PATCH 3/n to PATCH 1/n > > - echo "ERROR_CA_NOT_YET_SET" in case of error (feedback from Michael > > Olbrich) and also return 1 > > > > PATCH v1 (mkl): > > https://lore.ptxdist.org/ptxdist/20210412161900.2376802-3-...@pengutronix.de > > --- > > scripts/lib/ptxd_lib_code_signing.sh | 8 +++++++- > > 1 file changed, 7 insertions(+), 1 deletion(-) > > > > diff --git a/scripts/lib/ptxd_lib_code_signing.sh > > b/scripts/lib/ptxd_lib_code_signing.sh > > index 3e1654bb36e4..0026cdc4dec0 100644 > > --- a/scripts/lib/ptxd_lib_code_signing.sh > > +++ b/scripts/lib/ptxd_lib_code_signing.sh > > @@ -243,7 +243,13 @@ cs_get_ca() { > > local role="${1}" > > cs_init_variables > > > > - echo "${keydir}/${role}/ca.pem" > > + local ca="${keydir}/${role}/ca.pem" > > + > > + if [ ! -e "${ca}" ]; then > > This is not what I suggested. I think this breaks the use-case described in > the patch description: > An empty string should be returned when the key setup is done but nothing > was added to the CA. I'm quite certain, that the file does not exist in > this case. You need to check for '[ ! -d "${keydir}" ]'.
Hmm yes, my bad, that's even what you suggested in <https://lore.ptxdist.org/ptxdist/20210423063320.ge4162...@pengutronix.de/>… will fix it in v2. BTW, I like to get feedback mail as Cc into my inbox so I can keep a simple backlog of my still-to-be-done patches in addition to the PTXdist list mails, which go to a separate folder. (You often keep me in Cc, but somehow not always, but I think mutt should do this by default with the list-reply key binding …) - Roland > > Michael > > > + echo "ERROR_CA_NOT_YET_SET" > > + return 1 > > + fi > > + echo "${ca}" > > } > > export -f cs_get_ca > > > > -- > > 2.30.2 > > > > > > _______________________________________________ > > ptxdist mailing list > > ptxdist@pengutronix.de > > To unsubscribe, send a mail with subject "unsubscribe" to > > ptxdist-requ...@pengutronix.de > > > > -- > Pengutronix e.K. | | > Steuerwalder Str. 21 | http://www.pengutronix.de/ | > 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | > Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | > > _______________________________________________ > ptxdist mailing list > ptxdist@pengutronix.de > To unsubscribe, send a mail with subject "unsubscribe" to > ptxdist-requ...@pengutronix.de > -- Roland Hieber, Pengutronix e.K. | r.hie...@pengutronix.de | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
