Update libglnx
I want to use `glnx_tmpdir_unset()` in the `compose commit` PR. Update submodule: libglnx Closes: #1056 Approved by: jlebon
This commit is contained in:
parent
854c7db029
commit
aea688fa01
2
libglnx
2
libglnx
@ -1 +1 @@
|
||||
Subproject commit 627d4e2f15572e853279d4bb9511ef2618bef6b5
|
||||
Subproject commit e627524af9ae499c1edd04795442f8bdb05b5223
|
@ -124,7 +124,7 @@ rpm_ostree_tree_compose_context_free (RpmOstreeTreeComposeContext *ctx)
|
||||
/* Only close workdir_dfd if it's not owned by the tmpdir */
|
||||
if (!ctx->workdir_tmp.initialized && ctx->workdir_dfd != -1)
|
||||
(void) close (ctx->workdir_dfd);
|
||||
glnx_tmpdir_clear (&ctx->workdir_tmp);
|
||||
(void)glnx_tmpdir_delete (&ctx->workdir_tmp, NULL, NULL);
|
||||
if (ctx->rootfs_dfd != -1)
|
||||
(void) close (ctx->rootfs_dfd);
|
||||
if (ctx->cachedir_dfd != -1)
|
||||
|
@ -200,7 +200,7 @@ rpmostree_sysroot_upgrader_finalize (GObject *object)
|
||||
if (self->tmprootfs_dfd != -1)
|
||||
(void)close (self->tmprootfs_dfd);
|
||||
|
||||
glnx_tmpdir_clear (&self->metatmpdir);
|
||||
(void)glnx_tmpdir_delete (&self->metatmpdir, NULL, NULL);
|
||||
|
||||
g_clear_pointer (&self->devino_cache, (GDestroyNotify)ostree_repo_devino_cache_unref);
|
||||
|
||||
|
@ -96,7 +96,7 @@ rpmostree_bwrap_unref (RpmOstreeBwrap *bwrap)
|
||||
if (tmp_error)
|
||||
sd_journal_print (LOG_WARNING, "%s", tmp_error->message);
|
||||
}
|
||||
glnx_tmpdir_clear (&bwrap->rofiles_mnt);
|
||||
(void)glnx_tmpdir_delete (&bwrap->rofiles_mnt, NULL, NULL);
|
||||
|
||||
g_ptr_array_unref (bwrap->argv);
|
||||
g_free (bwrap);
|
||||
|
@ -284,7 +284,7 @@ rpmostree_context_finalize (GObject *object)
|
||||
g_clear_pointer (&rctx->pkgs_to_remove, g_hash_table_unref);
|
||||
g_clear_pointer (&rctx->pkgs_to_replace, g_hash_table_unref);
|
||||
|
||||
glnx_tmpdir_clear (&rctx->tmpdir);
|
||||
(void)glnx_tmpdir_delete (&rctx->tmpdir, NULL, NULL);
|
||||
|
||||
G_OBJECT_CLASS (rpmostree_context_parent_class)->finalize (object);
|
||||
}
|
||||
|
@ -55,6 +55,6 @@ rpmostree_refsack_unref (RpmOstreeRefSack *rsack)
|
||||
/* The sack might point to a temporarily allocated rpmdb copy, if so,
|
||||
* prune it now.
|
||||
*/
|
||||
glnx_tmpdir_clear (&rsack->tmpdir);
|
||||
(void)glnx_tmpdir_delete (&rsack->tmpdir, NULL, NULL);
|
||||
g_free (rsack);
|
||||
}
|
||||
|
@ -58,6 +58,6 @@ rpmostree_refts_unref (RpmOstreeRefTs *rts)
|
||||
if (!g_atomic_int_dec_and_test (&rts->refcount))
|
||||
return;
|
||||
rpmtsFree (rts->ts);
|
||||
glnx_tmpdir_clear (&rts->tmpdir);
|
||||
(void)glnx_tmpdir_delete (&rts->tmpdir, NULL, NULL);
|
||||
g_free (rts);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user