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

libpriv: Adjust internal package diff API to be fd-relative

Browse Source 
We presently have 3 internal code paths that are doing rpmdb
inspection.  This conversion to fd-relative for one of them is a
generic cleanup preparatory to de-duplicating.

Note this bumps libglnx to include
381ca54ee3
This commit is contained in:
Colin Walters 2015-04-17 11:11:39 -04:00
parent 3bf7926adc
commit f3600e922e
4 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libglnx

@ -1 +1 @@
Subproject commit c231a3b845981d4b237e8f63ef3503e070009386 Subproject commit 381ca54ee3a47de291d26a5db8772732fb4a9d59

3
src/libpriv/rpmostree-postprocess.c
View File

@ -1143,7 +1143,8 @@ rpmostree_treefile_postprocessing (GFile *yumroot,
remove = json_object_get_array_member (treefile, "remove-from-packages"); remove = json_object_get_array_member (treefile, "remove-from-packages");
len = json_array_get_length (remove); len = json_array_get_length (remove);
if (!rpmostree_get_pkglist_for_root (yumroot, &sack, &pkglist, if (!rpmostree_get_pkglist_for_root (AT_FDCWD, gs_file_get_path_cached (yumroot),
&sack, &pkglist,
cancellable, error)) cancellable, error))
{ {
g_prefix_error (error, "Reading package set: "); g_prefix_error (error, "Reading package set: ");

30
src/libpriv/rpmostree-treepkgdiff.c
View File

@ -26,7 +26,8 @@
#include "rpmostree-cleanup.h" #include "rpmostree-cleanup.h"
gboolean gboolean
rpmostree_get_pkglist_for_root (GFile *root, rpmostree_get_pkglist_for_root (int dfd,
const char *path,
HySack *out_sack, HySack *out_sack,
HyPackageList *out_pkglist, HyPackageList *out_pkglist,
GCancellable *cancellable, GCancellable *cancellable,
@ -37,15 +38,16 @@ rpmostree_get_pkglist_for_root (GFile *root,
_cleanup_hysack_ HySack sack = NULL; _cleanup_hysack_ HySack sack = NULL;
_cleanup_hyquery_ HyQuery query = NULL; _cleanup_hyquery_ HyQuery query = NULL;
_cleanup_hypackagelist_ HyPackageList pkglist = NULL; _cleanup_hypackagelist_ HyPackageList pkglist = NULL;
g_autofree char *fullpath = glnx_fdrel_abspath (dfd, path);
#if BUILDOPT_HAWKEY_SACK_CREATE2 #if BUILDOPT_HAWKEY_SACK_CREATE2
sack = hy_sack_create (NULL, NULL, sack = hy_sack_create (NULL, NULL,
gs_file_get_path_cached (root), fullpath,
NULL, NULL,
HY_MAKE_CACHE_DIR); HY_MAKE_CACHE_DIR);
#else #else
sack = hy_sack_create (NULL, NULL, sack = hy_sack_create (NULL, NULL,
gs_file_get_path_cached (root), fullpath,
HY_MAKE_CACHE_DIR); HY_MAKE_CACHE_DIR);
#endif #endif
if (sack == NULL) if (sack == NULL)
@ -73,8 +75,9 @@ rpmostree_get_pkglist_for_root (GFile *root,
} }
static gboolean static gboolean
print_rpmdb_diff (GFile *oldroot, print_rpmdb_diff (int dfd,
GFile *newroot, const char *oldroot,
const char *newroot,
GCancellable *cancellable, GCancellable *cancellable,
GError **error) GError **error)
{ {
@ -87,11 +90,11 @@ print_rpmdb_diff (GFile *oldroot,
HyPackage pkg; HyPackage pkg;
gboolean printed_header = FALSE; gboolean printed_header = FALSE;
if (!rpmostree_get_pkglist_for_root (oldroot, &old_sack, &old_pkglist, if (!rpmostree_get_pkglist_for_root (dfd, oldroot, &old_sack, &old_pkglist,
cancellable, error)) cancellable, error))
goto out; goto out;
if (!rpmostree_get_pkglist_for_root (newroot, &new_sack, &new_pkglist, if (!rpmostree_get_pkglist_for_root (dfd, newroot, &new_sack, &new_pkglist,
cancellable, error)) cancellable, error))
goto out; goto out;
@ -177,20 +180,23 @@ rpmostree_print_treepkg_diff (OstreeSysroot *sysroot,
OstreeDeployment *new_deployment; OstreeDeployment *new_deployment;
gs_unref_ptrarray GPtrArray *deployments = gs_unref_ptrarray GPtrArray *deployments =
ostree_sysroot_get_deployments (sysroot); ostree_sysroot_get_deployments (sysroot);
gs_unref_object GFile *booted_root = NULL; int sysroot_dfd;
gs_unref_object GFile *new_root = NULL;
booted_deployment = ostree_sysroot_get_booted_deployment (sysroot); booted_deployment = ostree_sysroot_get_booted_deployment (sysroot);
g_assert (deployments->len > 1); g_assert (deployments->len > 1);
new_deployment = deployments->pdata[0]; new_deployment = deployments->pdata[0];
sysroot_dfd = ostree_sysroot_get_fd (sysroot);
if (booted_deployment && new_deployment != booted_deployment) if (booted_deployment && new_deployment != booted_deployment)
{ {
booted_root = ostree_sysroot_get_deployment_directory (sysroot, booted_deployment); g_autofree char *booted_root =
new_root = ostree_sysroot_get_deployment_directory (sysroot, new_deployment); ostree_sysroot_get_deployment_dirpath (sysroot, booted_deployment);
g_autofree char *new_root =
ostree_sysroot_get_deployment_dirpath (sysroot, new_deployment);
if (!print_rpmdb_diff (booted_root, new_root, cancellable, error)) if (!print_rpmdb_diff (sysroot_dfd, booted_root, new_root, cancellable, error))
goto out; goto out;
} }

3
src/libpriv/rpmostree-treepkgdiff.h
View File

@ -24,7 +24,8 @@
#include "rpmostree-cleanup.h" #include "rpmostree-cleanup.h"
gboolean gboolean
rpmostree_get_pkglist_for_root (GFile *root, rpmostree_get_pkglist_for_root (int dfd,
const char *path,
HySack *out_sack, HySack *out_sack,
HyPackageList *out_pkglist, HyPackageList *out_pkglist,
GCancellable *cancellable, GCancellable *cancellable,