packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lib/sign: fix the false failure while loading keys 

Usage of 'g_warning()' inside keys loading funcrion lead to false
failure: the key loading attempt for the wrong engine breaks the
pulling process instead of trying to use this key with correct engine.

Signed-off-by: Denis Pynkin <denis.pynkin@collabora.com>
This commit is contained in:
Denis Pynkin 2019-11-25 22:53:28 +03:00
parent 5dca74fab7
commit 5cd822ae05
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/libostree/ostree-repo-pull.c
View File

@ -1492,7 +1492,6 @@ _load_public_keys (OtPullData *pull_data,
gboolean loaded_inlined = TRUE; gboolean loaded_inlined = TRUE;
g_autoptr (GError) error = NULL; g_autoptr (GError) error = NULL;
/* Load keys for remote from file */
ostree_repo_get_remote_option (pull_data->repo, ostree_repo_get_remote_option (pull_data->repo,
pull_data->remote_name, pull_data->remote_name,
"verification-file", NULL, "verification-file", NULL,
@ -1531,12 +1530,9 @@ _load_public_keys (OtPullData *pull_data,
loaded_from_file = TRUE; loaded_from_file = TRUE;
else else
{ {
if (error == NULL) g_assert (error);
g_set_error_literal (&error, G_IO_ERROR, G_IO_ERROR_FAILED, g_debug("Unable to load public keys for '%s' from file '%s': %s",
"unknown reason"); ostree_sign_get_name(sign), pk_file, error->message);
g_warning("Unable to load public keys from file '%s': %s",
pk_file, error->message);
g_clear_error (&error); g_clear_error (&error);
} }
} }
@ -1557,8 +1553,8 @@ _load_public_keys (OtPullData *pull_data,
g_set_error_literal (&error, G_IO_ERROR, G_IO_ERROR_FAILED, g_set_error_literal (&error, G_IO_ERROR, G_IO_ERROR_FAILED,
"unknown reason"); "unknown reason");
g_warning("Unable to load public key '%s': %s", g_debug("Unable to load public key '%s' for '%s': %s",
pk_ascii, error->message); pk_ascii, ostree_sign_get_name(sign), error->message);
g_clear_error (&error); g_clear_error (&error);
} }
} }