fixup! daemon: Add new Reload D-Bus method

coreos · Mar 23, 2018 · 23c00bf · 23c00bf
1 parent 0387237
commit 23c00bf
Showing 1 changed file with 4 additions and 4 deletions.
diff --git 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);