From mboxrd@z Thu Jan  1 00:00:00 1970
Return-path: <ptxdist-bounces@pengutronix.de>
In-Reply-To: <20200515142641.812-3-bst@pengutronix.de>
MIME-Version: 1.0
Message-Id: <E1jb1HW-000193-81@dude02.lab.pengutronix.de>
From: Michael Olbrich <mol@pengutronix.de>
Date: Tue, 19 May 2020 14:23:38 +0200
Subject: Re: [ptxdist] [APPLIED] ptxd_lib_code_signing: return error string
 in cs_get_uri for make error case
List-Id: PTXdist Development Mailing List <ptxdist.pengutronix.de>
List-Unsubscribe: <http://metis.pengutronix.de/cgi-bin/mailman/options/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=unsubscribe>
List-Archive: <http://metis.pengutronix.de/cgi-bin/mailman/private/ptxdist/>
List-Post: <mailto:ptxdist@pengutronix.de>
List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help>
List-Subscribe: <http://metis.pengutronix.de/cgi-bin/mailman/listinfo/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=subscribe>
Reply-To: ptxdist@pengutronix.de
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ptxdist-bounces@pengutronix.de
Sender: "ptxdist" <ptxdist-bounces@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Bastian Krause <bst@pengutronix.de>

Thanks, applied as 6c024da4d92217c468983d4a8bd8c3e252d36af8.

Michael

[sent from post-receive hook]

On Tue, 19 May 2020 14:23:38 +0200, Bastian Krause <bst@pengutronix.de> wrote:
> Signed-off-by: Bastian Krause <bst@pengutronix.de>
> Message-Id: <20200515142641.812-3-bst@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/scripts/lib/ptxd_lib_code_signing.sh b/scripts/lib/ptxd_lib_code_signing.sh
> index 588a4b1b44fa..f93f183df8e8 100644
> --- a/scripts/lib/ptxd_lib_code_signing.sh
> +++ b/scripts/lib/ptxd_lib_code_signing.sh
> @@ -154,7 +154,11 @@ cs_get_uri() {
>  	if [ ${#FUNCNAME[*]} -gt 1 ]; then
>  	    ptxd_bailout "No PKCS#11 URI for role ${role}"
>  	else
> -	    # ignore the error if cs_get_uri is called directly from make
> +	    # cs_get_uri was called directly from make prior to cs_set_uri,
> +	    # which may not be an error if it is evaluated early *and* later
> +	    # again - return a unique error string in case it is not expected
> +	    # and a user stumbles upon this
> +	    echo "ERROR_URI_NOT_YET_SET"
>  	    return
>  	fi
>      fi

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de