X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=recipes-connectivity%2Fkuksa-val%2Fkuksa-dbc-feeder%2F0003-dbc2val-fix-token-file-configuration-option.patch;h=aae8b3dc051769c1d556d0067c2aaa346e7aa33b;hb=a620f3a712bab0dd80c8ecaa49e1ebb062fabbb6;hp=e3f3de655b75c993540699168f7f0858094e1acb;hpb=8f7253caab8e815b3fb43eb462fbb207238891f4;p=AGL%2Fmeta-agl-demo.git diff --git a/recipes-connectivity/kuksa-val/kuksa-dbc-feeder/0003-dbc2val-fix-token-file-configuration-option.patch b/recipes-connectivity/kuksa-val/kuksa-dbc-feeder/0003-dbc2val-fix-token-file-configuration-option.patch index e3f3de655..aae8b3dc0 100644 --- a/recipes-connectivity/kuksa-val/kuksa-dbc-feeder/0003-dbc2val-fix-token-file-configuration-option.patch +++ b/recipes-connectivity/kuksa-val/kuksa-dbc-feeder/0003-dbc2val-fix-token-file-configuration-option.patch @@ -1,4 +1,4 @@ -From e2b5305a48a8c5ce5c149437e44d1b82f4b94432 Mon Sep 17 00:00:00 2001 +From dc20da27a73141b04cc6b0ce5d74e547d6fc7256 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Mon, 8 May 2023 14:58:06 -0400 Subject: [PATCH] dbc2val: fix token file configuration option @@ -10,23 +10,21 @@ location can be configured again for dbcfeeder.py. Upstream-Status: pending Signed-off-by: Scott Murray + --- dbc2val/dbcfeederlib/serverclientwrapper.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dbc2val/dbcfeederlib/serverclientwrapper.py b/dbc2val/dbcfeederlib/serverclientwrapper.py -index 851516b..4f44913 100644 +index 1219a76..63bc12e 100644 --- a/dbc2val/dbcfeederlib/serverclientwrapper.py +++ b/dbc2val/dbcfeederlib/serverclientwrapper.py -@@ -60,7 +60,7 @@ class ServerClientWrapper(clientwrapper.ClientWrapper): +@@ -59,7 +59,7 @@ class ServerClientWrapper(clientwrapper.ClientWrapper): self._client_config["insecure"] = not self._tls # Do not set token if it is empty to allow default client lib info to be used if self._token_path != "": - self._client_config["token"] = self._token_path + self._client_config["token_or_tokenfile"] = self._token_path - # TODO add data for root cert if using TLS and if given - --- -2.39.2 - + if self._root_ca_path: + self._client_config['cacertificate'] = self._root_ca_path