mirror of
https://github.com/ostreedev/ostree.git
synced 2024-12-22 17:35:55 +03:00
Merge pull request #2951 from cgwalters/errprefix-sysroot
sysroot: Add a bit more error prefixing
This commit is contained in:
commit
3f594b04aa
@ -2838,8 +2838,9 @@ static gboolean
|
||||
append_one_remote_config (OstreeRepo *self, GFile *path, GCancellable *cancellable, GError **error)
|
||||
{
|
||||
g_autoptr (GKeyFile) remotedata = g_key_file_new ();
|
||||
if (!g_key_file_load_from_file (remotedata, gs_file_get_path_cached (path), 0, error))
|
||||
return FALSE;
|
||||
const char *pathname = gs_file_get_path_cached (path);
|
||||
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);
|
||||
}
|
||||
@ -3245,6 +3246,7 @@ reload_core_config (OstreeRepo *self, GCancellable *cancellable, GError **error)
|
||||
static gboolean
|
||||
reload_remote_config (OstreeRepo *self, GCancellable *cancellable, GError **error)
|
||||
{
|
||||
GLNX_AUTO_PREFIX_ERROR ("Reloading remotes", error);
|
||||
|
||||
g_mutex_lock (&self->remotes_lock);
|
||||
g_hash_table_remove_all (self->remotes);
|
||||
|
@ -964,6 +964,8 @@ ostree_sysroot_load (OstreeSysroot *self, GCancellable *cancellable, GError **er
|
||||
static gboolean
|
||||
ensure_repo (OstreeSysroot *self, GError **error)
|
||||
{
|
||||
GLNX_AUTO_PREFIX_ERROR ("Opening sysroot repo", error);
|
||||
|
||||
if (self->repo != NULL)
|
||||
return TRUE;
|
||||
if (!ensure_sysroot_fd (self, error))
|
||||
@ -1002,6 +1004,8 @@ ensure_repo (OstreeSysroot *self, GError **error)
|
||||
gboolean
|
||||
ostree_sysroot_initialize (OstreeSysroot *self, GError **error)
|
||||
{
|
||||
GLNX_AUTO_PREFIX_ERROR ("Initializing sysroot", error);
|
||||
|
||||
if (!ensure_sysroot_fd (self, error))
|
||||
return FALSE;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user