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

app/status: factor out get_sd_unit_objpath() function

Browse Source 
Factor out a `get_sd_unit_objpath()` function into `libbuiltin`
so we can reuse the code in `builtin_upgrade`.
This commit is contained in:
Kelvin Fan 2021-02-11 16:14:26 -05:00 committed by OpenShift Merge Robot
parent e6c045cada
commit 261b9cbb87
3 changed files with 36 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/app/rpmostree-builtin-status.cxx
View File

@ -286,20 +286,10 @@ get_update_driver_state (RPMOSTreeSysroot *sysroot_proxy,
GDBusConnection *connection =
g_dbus_proxy_get_connection (G_DBUS_PROXY (sysroot_proxy));
/* Query systemd for update driver's systemd unit's object path. */
g_autoptr(GVariant) update_driver_objpath_tuple =
g_dbus_connection_call_sync (connection, "org.freedesktop.systemd1", "/org/freedesktop/systemd1",
"org.freedesktop.systemd1.Manager", "LoadUnit",
g_variant_new ("(s)", update_driver_sd_unit), G_VARIANT_TYPE_TUPLE,
G_DBUS_CALL_FLAGS_NONE, -1, cancellable, error);
if (!update_driver_objpath_tuple)
const char *update_driver_objpath = NULL;
if (!get_sd_unit_objpath(connection, update_driver_sd_unit, &update_driver_objpath,
cancellable, error))
return FALSE;
else if (g_variant_n_children (update_driver_objpath_tuple) < 1)
return glnx_throw (error, "LoadUnit(%s) returned empty tuple", update_driver_sd_unit);
g_autoptr(GVariant) update_driver_objpath_val =
g_variant_get_child_value (update_driver_objpath_tuple, 0);
const char *update_driver_objpath = g_variant_get_string (update_driver_objpath_val, NULL);
/* Look up ActiveState property of update driver's systemd unit. */
g_autoptr(GDBusProxy) update_driver_unit_obj_proxy =

26
src/app/rpmostree-libbuiltin.cxx
View File

@ -141,3 +141,29 @@ rpmostree_print_timestamp_version (const char *version_string,
rpmostree_print_kv ("Version", max_key_len, version_time);
}
}
/* Query systemd for update driver's systemd unit's object path. */
gboolean
get_sd_unit_objpath (GDBusConnection *connection,
const char *update_driver_sd_unit,
const char **update_driver_objpath,
GCancellable *cancellable,
GError **error)
{
g_autoptr(GVariant) update_driver_objpath_tuple =
g_dbus_connection_call_sync (connection, "org.freedesktop.systemd1", "/org/freedesktop/systemd1",
"org.freedesktop.systemd1.Manager", "LoadUnit",
g_variant_new ("(s)", update_driver_sd_unit), G_VARIANT_TYPE_TUPLE,
G_DBUS_CALL_FLAGS_NONE, -1, cancellable, error);
if (!update_driver_objpath_tuple)
return FALSE;
else if (g_variant_n_children (update_driver_objpath_tuple) < 1)
return glnx_throw (error, "LoadUnit(%s) returned empty tuple", update_driver_sd_unit);
g_autoptr(GVariant) update_driver_objpath_val =
g_variant_get_child_value (update_driver_objpath_tuple, 0);
*update_driver_objpath = g_variant_dup_string (update_driver_objpath_val, NULL);
g_assert (*update_driver_objpath);
return TRUE;
}

7
src/app/rpmostree-libbuiltin.h
View File

@ -75,4 +75,11 @@ rpmostree_print_timestamp_version (const char *version_string,
const char *timestamp_string,
guint max_key_len);
gboolean
get_sd_unit_objpath (GDBusConnection *connection,
const char *update_driver_sd_unit,
const char **update_driver_objpath,
GCancellable *cancellable,
GError **error);
G_END_DECLS