keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

daemon/syscore: Add some error prefixing to cleanup paths

Browse Source 
Would likely have helped clarify this issue where an ostree repo txn failed
post-bootloader txn: <https://github.com/projectatomic/rpm-ostree/issues/958>

Closes: #960
Approved by: jlebon
This commit is contained in:
Colin Walters 2017-08-28 16:43:54 -04:00 committed by Atomic Bot
parent 44ea9f35a1
commit 4cbdcf93c8
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/daemon/rpmostree-sysroot-core.c
View File

@ -57,6 +57,7 @@ generate_baselayer_refs (OstreeSysroot *sysroot,
GCancellable *cancellable, GCancellable *cancellable,
GError **error) GError **error)
{ {
GLNX_AUTO_PREFIX_ERROR ("baselayer refs", error);
gboolean ret = FALSE; gboolean ret = FALSE;
g_autoptr(GHashTable) refs = NULL; g_autoptr(GHashTable) refs = NULL;
g_autoptr(GHashTable) bases = g_autoptr(GHashTable) bases =
@ -156,6 +157,7 @@ clean_pkgcache_orphans (OstreeSysroot *sysroot,
GCancellable *cancellable, GCancellable *cancellable,
GError **error) GError **error)
{ {
GLNX_AUTO_PREFIX_ERROR ("pkgcache cleanup", error);
g_autoptr(GHashTable) referenced_pkgs = /* cache refs of packages we want to keep */ g_autoptr(GHashTable) referenced_pkgs = /* cache refs of packages we want to keep */
g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
@ -249,6 +251,7 @@ rpmostree_syscore_cleanup (OstreeSysroot *sysroot,
GCancellable *cancellable, GCancellable *cancellable,
GError **error) GError **error)
{ {
GLNX_AUTO_PREFIX_ERROR ("syscore cleanup", error);
int repo_dfd = ostree_repo_get_dfd (repo); /* borrowed */ int repo_dfd = ostree_repo_get_dfd (repo); /* borrowed */
/* regenerate the baselayer refs in case we just kicked out an ancient layered /* regenerate the baselayer refs in case we just kicked out an ancient layered