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

rpmostree-dbus-helpers: generalize pkg sorting

Browse Source 
Minor prep for replace overrides.

Let rpmostree_sort_pkgs_strv work on an existing fd list rather than
creating its own, since it may be called multiple times on different
pkgs arrays.

Factor out the logic that calls to sort and inserts the values in the
final modifiers variant dict to prepare for being able to do this
operation multiple times.

Closes: #829
Approved by: cgwalters
This commit is contained in:
Jonathan Lebon 2017-06-12 12:43:27 -04:00 committed by Atomic Bot
parent 6b74f440dc
commit 4ee57a6dbd
2 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/app/rpmostree-dbus-helpers.c
View File

@ -765,13 +765,12 @@ rpmostree_print_package_diffs (GVariant *variant)
* pkgs, an fd list & idx variant. */
gboolean
rpmostree_sort_pkgs_strv (const char *const* pkgs,
GUnixFDList *fd_list,
GPtrArray **out_repo_pkgs,
GUnixFDList **out_fd_list,
GVariant **out_fd_idxs,
GError **error)
{
g_autoptr(GPtrArray) repo_pkgs = g_ptr_array_new_with_free_func (g_free);
glnx_unref_object GUnixFDList *fd_list = g_unix_fd_list_new ();
g_auto(GVariantBuilder) builder;
g_variant_builder_init (&builder, G_VARIANT_TYPE ("ah"));
@ -793,7 +792,6 @@ rpmostree_sort_pkgs_strv (const char *const* pkgs,
}
}
*out_fd_list = g_steal_pointer (&fd_list);
*out_fd_idxs = g_variant_ref_sink (g_variant_new ("ah", &builder));
*out_repo_pkgs = g_steal_pointer (&repo_pkgs);
return TRUE;
@ -808,6 +806,32 @@ vardict_insert_strv (GVariantDict *dict,
g_variant_dict_insert (dict, key, "^as", (char**)strv);
}
static gboolean
vardict_sort_and_insert_pkgs (GVariantDict *dict,
const char *key_prefix,
GUnixFDList *fd_list,
const char *const* pkgs,
GError **error)
{
g_autoptr(GVariant) fd_idxs = NULL;
g_autoptr(GPtrArray) repo_pkgs = NULL;
if (!rpmostree_sort_pkgs_strv (pkgs, fd_list, &repo_pkgs, &fd_idxs, error))
return FALSE;
/* for grep: here we insert install-packages */
if (repo_pkgs != NULL && repo_pkgs->len > 0)
g_variant_dict_insert_value (dict, glnx_strjoina (key_prefix, "-packages"),
g_variant_new_strv ((const char *const*)repo_pkgs->pdata,
repo_pkgs->len));
/* for grep: here we insert install-local-packages */
if (fd_idxs != NULL)
g_variant_dict_insert_value (dict, glnx_strjoina (key_prefix, "-local-packages"),
fd_idxs);
return TRUE;
}
static gboolean
get_modifiers_variant (const char *set_refspec,
const char *set_revision,
@ -822,23 +846,13 @@ get_modifiers_variant (const char *set_refspec,
{
GVariantDict dict;
g_variant_dict_init (&dict, NULL);
glnx_unref_object GUnixFDList *fd_list = NULL;
g_autoptr(GUnixFDList) fd_list = g_unix_fd_list_new ();
/* let's take care of install_pkgs first since it can fail */
if (install_pkgs)
{
g_autoptr(GPtrArray) repo_pkgs = NULL;
g_autoptr(GVariant) fd_idxs = NULL;
if (!rpmostree_sort_pkgs_strv (install_pkgs, &repo_pkgs, &fd_list,
&fd_idxs, error))
if (!vardict_sort_and_insert_pkgs (&dict, "install", fd_list,
install_pkgs, error))
return FALSE;
if (repo_pkgs != NULL && repo_pkgs->len > 0)
g_variant_dict_insert_value (&dict, "install-packages",
g_variant_new_strv ((const char *const*)repo_pkgs->pdata,
repo_pkgs->len));
if (fd_idxs != NULL)
g_variant_dict_insert_value (&dict, "install-local-packages", fd_idxs);
}
if (set_refspec)

2
src/app/rpmostree-dbus-helpers.h
View File

@ -77,8 +77,8 @@ rpmostree_print_package_diffs (GVariant *variant);
gboolean
rpmostree_sort_pkgs_strv (const char *const* pkgs,
GUnixFDList *fd_list,
GPtrArray **out_repo_pkgs,
GUnixFDList **out_fd_list,
GVariant **out_fd_idxs,
GError **error);