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

daemon: Rename sysroot_reload to be more descriptive

Browse Source 
Follow-up to previous commit. Since we have so many concepts called
"sysroot" and "configs", let's be explicit with our naming here to be
sure we know what we're calling.

Closes: #1311
Approved by: cgwalters
This commit is contained in:
Jonathan Lebon 2018-03-23 15:40:34 -04:00 committed by Atomic Bot
parent 60aa9a4a33
commit 747236d593
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/daemon/rpmostreed-sysroot.c
View File

@ -40,9 +40,9 @@
#include <systemd/sd-journal.h> #include <systemd/sd-journal.h>
static gboolean static gboolean
sysroot_reload (RpmostreedSysroot *self, sysroot_reload_ostree_configs_and_deployments (RpmostreedSysroot *self,
gboolean *out_changed, gboolean *out_changed,
GError **error); GError **error);
/** /**
* SECTION: sysroot * SECTION: sysroot
@ -448,7 +448,7 @@ handle_reload_config (RPMOSTreeSysroot *object,
goto out; goto out;
gboolean sysroot_changed; gboolean sysroot_changed;
if (!sysroot_reload (self, &sysroot_changed, error)) if (!sysroot_reload_ostree_configs_and_deployments (self, &sysroot_changed, error))
goto out; goto out;
/* also send an UPDATED signal if configs changed to cause OS interfaces to reload; we do /* also send an UPDATED signal if configs changed to cause OS interfaces to reload; we do
@ -697,9 +697,9 @@ rpmostreed_sysroot_class_init (RpmostreedSysrootClass *klass)
} }
static gboolean static gboolean
sysroot_reload (RpmostreedSysroot *self, sysroot_reload_ostree_configs_and_deployments (RpmostreedSysroot *self,
gboolean *out_changed, gboolean *out_changed,
GError **error) GError **error)
{ {
gboolean ret = FALSE; gboolean ret = FALSE;
gboolean did_change; gboolean did_change;
@ -722,7 +722,7 @@ sysroot_reload (RpmostreedSysroot *self,
gboolean gboolean
rpmostreed_sysroot_reload (RpmostreedSysroot *self, GError **error) rpmostreed_sysroot_reload (RpmostreedSysroot *self, GError **error)
{ {
return sysroot_reload (self, NULL, error); return sysroot_reload_ostree_configs_and_deployments (self, NULL, error);
} }
static void static void