This patch is replaced by
https://lists.openembedded.org/g/openembedded-core/message/175355 (with a
minor patch title change)
On Mon, Jan 2, 2023 at 8:03 AM Marta Rybczynska <rybczyn...@gmail.com>
wrote:
> Move cleanup of the database after a failed download to a separate
> function. This will be useful when we have more actions to do in
> that situation.
>
> Signed-off-by: Marta Rybczynska <marta.rybczyn...@linaro.org>
> ---
> meta/recipes-core/meta/cve-update-db-native.bb | 17 ++++++++++-------
> 1 file changed, 10 insertions(+), 7 deletions(-)
>
> diff --git a/meta/recipes-core/meta/cve-update-db-native.bb
> b/meta/recipes-core/meta/cve-update-db-native.bb
> index 9b9dbbd75f..642fda5395 100644
> --- a/meta/recipes-core/meta/cve-update-db-native.bb
> +++ b/meta/recipes-core/meta/cve-update-db-native.bb
> @@ -44,13 +44,7 @@ python do_fetch() {
>
> cve_socket_timeout = int(d.getVar("CVE_SOCKET_TIMEOUT"))
>
> - if os.path.exists("{0}-journal".format(db_file)):
> - # If a journal is present the last update might have been
> interrupted. In that case,
> - # just wipe any leftovers and force the DB to be recreated.
> - os.remove("{0}-journal".format(db_file))
> -
> - if os.path.exists(db_file):
> - os.remove(db_file)
> + cleanup_db_download(db_file)
>
> # The NVD database changes once a day, so no need to update more
> frequently
> # Allow the user to force-update
> @@ -134,6 +128,15 @@ do_fetch[lockfiles] += "${CVE_CHECK_DB_FILE_LOCK}"
> do_fetch[file-checksums] = ""
> do_fetch[vardeps] = ""
>
> +def cleanup_db_download(db_file):
> + if os.path.exists("{0}-journal".format(db_file)):
> + # If a journal is present the last update might have been
> interrupted. In that case,
> + # just wipe any leftovers and force the DB to be recreated.
> + os.remove("{0}-journal".format(db_file))
> +
> + if os.path.exists(db_file):
> + os.remove(db_file)
> +
> def initialize_db(conn):
> with conn:
> c = conn.cursor()
> --
> 2.35.1
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#175485):
https://lists.openembedded.org/g/openembedded-core/message/175485
Mute This Topic: https://lists.openembedded.org/mt/96002806/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
