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

Merge pull request #2045 from cgwalters/sysroot-load-err 

lib: Add error prefixing for sysroot load and repo open
This commit is contained in:
OpenShift Merge Robot 2020-03-28 18:44:49 +01:00 committed by GitHub
parent 7a95929867 9cb148c9b9
commit 1003a2dbde
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3257,6 +3257,8 @@ ostree_repo_open (OstreeRepo *self,
GCancellable *cancellable, GCancellable *cancellable,
GError **error) GError **error)
{ {
GLNX_AUTO_PREFIX_ERROR ("opening repo", error);
struct stat stbuf; struct stat stbuf;
g_return_val_if_fail (error == NULL || *error == NULL, FALSE); g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
@ -3291,10 +3293,7 @@ ostree_repo_open (OstreeRepo *self,
g_assert (self->repodir); g_assert (self->repodir);
if (!glnx_opendirat (AT_FDCWD, gs_file_get_path_cached (self->repodir), TRUE, if (!glnx_opendirat (AT_FDCWD, gs_file_get_path_cached (self->repodir), TRUE,
&self->repo_dir_fd, error)) &self->repo_dir_fd, error))
{ return FALSE;
g_prefix_error (error, "%s: ", gs_file_get_path_cached (self->repodir));
return FALSE;
}
} }
if (!glnx_fstat (self->repo_dir_fd, &stbuf, error)) if (!glnx_fstat (self->repo_dir_fd, &stbuf, error))

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

@ -1003,6 +1003,7 @@ ostree_sysroot_load_if_changed (OstreeSysroot *self,
GCancellable *cancellable, GCancellable *cancellable,
GError **error) GError **error)
{ {
GLNX_AUTO_PREFIX_ERROR ("loading sysroot", error);
if (!ostree_sysroot_initialize (self, error)) if (!ostree_sysroot_initialize (self, error))
return FALSE; return FALSE;