From 23c00bfc669bc3c29d718459cb7aebe36b2383fb Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Fri, 23 Mar 2018 14:22:23 -0400 Subject: [PATCH] fixup! daemon: Add new Reload D-Bus method --- src/daemon/rpmostreed-sysroot.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/daemon/rpmostreed-sysroot.c b/src/daemon/rpmostreed-sysroot.c index 3a2b2a2f4b..c070316f13 100644 --- a/src/daemon/rpmostreed-sysroot.c +++ b/src/daemon/rpmostreed-sysroot.c @@ -433,8 +433,8 @@ reset_config_properties (RpmostreedSysroot *self, } static gboolean -reload_sysroot_and_os (RpmostreedSysroot *self, - GError **error) +reload_sysroot_force_os_reload (RpmostreedSysroot *self, + GError **error) { gboolean sysroot_changed; if (!sysroot_reload (self, &sysroot_changed, error)) @@ -454,7 +454,7 @@ handle_reload (RPMOSTreeSysroot *object, RpmostreedSysroot *self = RPMOSTREED_SYSROOT (object); g_autoptr(GError) local_error = NULL; - if (reload_sysroot_and_os (self, &local_error)) + if (reload_sysroot_force_os_reload (self, &local_error)) rpmostree_sysroot_complete_reload (object, invocation); else if (local_error) g_dbus_method_invocation_take_error (invocation, g_steal_pointer (&local_error)); @@ -477,7 +477,7 @@ handle_reload_config (RPMOSTreeSysroot *object, if (changed && !reset_config_properties (self, error)) goto out; - if (!reload_sysroot_and_os (self, error)) + if (!reload_sysroot_force_os_reload (self, error)) goto out; rpmostree_sysroot_complete_reload_config (object, invocation);