From 842c26e9b8a11a15a00d0a994608dc919e71e8b5 Mon Sep 17 00:00:00 2001 From: Joseph Marrero Corchado Date: Fri, 26 Apr 2024 12:15:13 -0400 Subject: [PATCH] f40: more fixes --- src/app/rpmostree-clientlib.cxx | 2 +- tests/compose.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/rpmostree-clientlib.cxx b/src/app/rpmostree-clientlib.cxx index 3902fa99b4..e4e0f13dd6 100644 --- a/src/app/rpmostree-clientlib.cxx +++ b/src/app/rpmostree-clientlib.cxx @@ -770,7 +770,7 @@ rpmostree_print_gpg_info (GVariant *signatures, gboolean verbose, guint max_key_ { /* +2 for initial leading spaces */ const guint gpgpad = max_key_len + 2 + strlen (": "); - char *gpgspaces = new char[gpgpad + 1]; + g_autofree char *gpgspaces = (char *)g_malloc (gpgpad + 1); memset (gpgspaces, ' ', gpgpad); gpgspaces[gpgpad] = '\0'; diff --git a/tests/compose.sh b/tests/compose.sh index 436ec6fba8..1ca031cc43 100755 --- a/tests/compose.sh +++ b/tests/compose.sh @@ -3,7 +3,7 @@ set -euo pipefail # freeze on a specific commit for tests for reproducibility and since it should # always work to target older treefiles -FEDORA_COREOS_CONFIG_COMMIT=ce65013fcb9f10bfee1c7c1c27477c6c6ce676b3 +FEDORA_COREOS_CONFIG_COMMIT=83f419c54bad614d70149830cc3b25fe4b93433e dn=$(cd "$(dirname "$0")" && pwd) topsrcdir=$(cd "$dn/.." && pwd) @@ -49,7 +49,7 @@ if [ ! -d compose-cache ]; then # default; we'll want it to test `install-langs`. This also means that we have # to add updates-archive to the repo list. # Also neuter OSTree layers; we don't re-implement cosa's auto-layering sugar - curl -LO https://src.fedoraproject.org/rpms/fedora-repos/raw/f37/f/fedora-updates-archive.repo + curl -LO https://src.fedoraproject.org/rpms/fedora-repos/raw/f40/f/fedora-updates-archive.repo python3 -c ' import sys, json y = json.load(sys.stdin)