shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2025-01-10 05:18:30 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2951 from cgwalters/errprefix-sysroot

Browse Source 
sysroot: Add a bit more error prefixing
This commit is contained in:
Eric Curtin 2023-07-24 21:07:28 +01:00 committed by GitHub
commit 3f594b04aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libostree/ostree-repo.c
View File

@ -2838,8 +2838,9 @@ static gboolean
append_one_remote_config (OstreeRepo *self, GFile *path, GCancellable *cancellable, GError **error) append_one_remote_config (OstreeRepo *self, GFile *path, GCancellable *cancellable, GError **error)
{ {
g_autoptr (GKeyFile) remotedata = g_key_file_new (); g_autoptr (GKeyFile) remotedata = g_key_file_new ();
if (!g_key_file_load_from_file (remotedata, gs_file_get_path_cached (path), 0, error)) const char *pathname = gs_file_get_path_cached (path);
return FALSE; if (!g_key_file_load_from_file (remotedata, pathname, 0, error))
return glnx_prefix_error (error, "Failed to parse %s", pathname);
return add_remotes_from_keyfile (self, remotedata, path, error); return add_remotes_from_keyfile (self, remotedata, path, error);
} }
@ -3245,6 +3246,7 @@ reload_core_config (OstreeRepo *self, GCancellable *cancellable, GError **error)
static gboolean static gboolean
reload_remote_config (OstreeRepo *self, GCancellable *cancellable, GError **error) reload_remote_config (OstreeRepo *self, GCancellable *cancellable, GError **error)
{ {
GLNX_AUTO_PREFIX_ERROR ("Reloading remotes", error);
g_mutex_lock (&self->remotes_lock); g_mutex_lock (&self->remotes_lock);
g_hash_table_remove_all (self->remotes); g_hash_table_remove_all (self->remotes);

4
src/libostree/ostree-sysroot.c
View File

@ -964,6 +964,8 @@ ostree_sysroot_load (OstreeSysroot *self, GCancellable *cancellable, GError **er
static gboolean static gboolean
ensure_repo (OstreeSysroot *self, GError **error) ensure_repo (OstreeSysroot *self, GError **error)
{ {
GLNX_AUTO_PREFIX_ERROR ("Opening sysroot repo", error);
if (self->repo != NULL) if (self->repo != NULL)
return TRUE; return TRUE;
if (!ensure_sysroot_fd (self, error)) if (!ensure_sysroot_fd (self, error))
@ -1002,6 +1004,8 @@ ensure_repo (OstreeSysroot *self, GError **error)
gboolean gboolean
ostree_sysroot_initialize (OstreeSysroot *self, GError **error) ostree_sysroot_initialize (OstreeSysroot *self, GError **error)
{ {
GLNX_AUTO_PREFIX_ERROR ("Initializing sysroot", error);
if (!ensure_sysroot_fd (self, error)) if (!ensure_sysroot_fd (self, error))
return FALSE; return FALSE;