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

daemon: Simplify how we load deployments

Browse Source 
I was going to add a `StagedDeployment` property and
found the code here confusing in the way we were walking
the whole deployment list.  Let's use the
`ostree_sysroot_query_deployments_for()` API for all
cases here.  Then the special case is just:
"if no booted deployment, default == pending".

Also change the code style to declare-and-initialize.

Prep for staging deployments.

Closes: #1327
Approved by: jlebon
This commit is contained in:
Colin Walters 2018-04-05 19:57:51 +00:00 committed by Atomic Bot
parent 2b624acff0
commit 0d0b9c85ee
1 changed files with 38 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
src/daemon/rpmostreed-os.c
View File

@ -1788,78 +1788,59 @@ refresh_cached_update (RpmostreedOS *self, GError **error)
static gboolean static gboolean
rpmostreed_os_load_internals (RpmostreedOS *self, GError **error) rpmostreed_os_load_internals (RpmostreedOS *self, GError **error)
{ {
const gchar *name; const gchar *name = rpmostree_os_get_name (RPMOSTREE_OS (self));
OstreeDeployment *booted = NULL; /* owned by sysroot */
g_autofree gchar* booted_id = NULL;
g_autoptr(GPtrArray) deployments = NULL;
OstreeSysroot *ot_sysroot;
OstreeRepo *ot_repo;
GVariant *booted_variant = NULL;
GVariant *default_variant = NULL;
GVariant *rollback_variant = NULL;
name = rpmostree_os_get_name (RPMOSTREE_OS (self));
g_debug ("loading %s", name); g_debug ("loading %s", name);
ot_sysroot = rpmostreed_sysroot_get_root (rpmostreed_sysroot_get ()); OstreeSysroot *ot_sysroot = rpmostreed_sysroot_get_root (rpmostreed_sysroot_get ());
ot_repo = rpmostreed_sysroot_get_repo (rpmostreed_sysroot_get ()); OstreeRepo *ot_repo = rpmostreed_sysroot_get_repo (rpmostreed_sysroot_get ());
booted = ostree_sysroot_get_booted_deployment (ot_sysroot); g_autofree gchar* booted_id = NULL;
if (booted && g_strcmp0 (ostree_deployment_get_osname (booted), name) == 0) OstreeDeployment *booted_deployment = ostree_sysroot_get_booted_deployment (ot_sysroot);
g_autoptr(GVariant) booted_variant = NULL; /* Strong ref as we reuse it below */
if (booted_deployment && g_strcmp0 (ostree_deployment_get_osname (booted_deployment), name) == 0)
{ {
booted_variant = rpmostreed_deployment_generate_variant (ot_sysroot, booted, booted_id, booted_variant =
ot_repo, error); g_variant_ref_sink (rpmostreed_deployment_generate_variant (ot_sysroot, booted_deployment, booted_id,
ot_repo, error));
if (!booted_variant) if (!booted_variant)
return FALSE; return FALSE;
booted_id = rpmostreed_deployment_generate_id (booted); booted_id = rpmostreed_deployment_generate_id (booted_deployment);
} }
else
booted_variant = g_variant_ref_sink (rpmostreed_deployment_generate_blank_variant ());
rpmostree_os_set_booted_deployment (RPMOSTREE_OS (self), booted_variant);
deployments = ostree_sysroot_get_deployments (ot_sysroot); g_autoptr(OstreeDeployment) rollback_deployment = NULL;
for (guint i=0; i<deployments->len; i++) g_autoptr(OstreeDeployment) pending_deployment = NULL;
ostree_sysroot_query_deployments_for (ot_sysroot, name,
&pending_deployment, &rollback_deployment);
g_autoptr(GVariant) default_variant = NULL;
if (pending_deployment)
{ {
if (g_strcmp0 (ostree_deployment_get_osname (deployments->pdata[i]), name) == 0) default_variant =
{ g_variant_ref_sink (rpmostreed_deployment_generate_variant (ot_sysroot,
default_variant = rpmostreed_deployment_generate_variant (ot_sysroot, pending_deployment,
deployments->pdata[i],
booted_id, booted_id,
ot_repo, error); ot_repo, error));
if (default_variant == NULL)
return FALSE;
break;
}
}
if (booted)
{
g_autoptr(OstreeDeployment) rollback = NULL;
ostree_sysroot_query_deployments_for (ot_sysroot,
ostree_deployment_get_osname (booted),
NULL, &rollback);
if (rollback)
{
rollback_variant = rpmostreed_deployment_generate_variant (ot_sysroot, rollback, booted_id,
ot_repo, error);
if (!rollback_variant)
return FALSE;
}
}
if (!booted_variant)
booted_variant = rpmostreed_deployment_generate_blank_variant ();
rpmostree_os_set_booted_deployment (RPMOSTREE_OS (self),
booted_variant);
if (!default_variant) if (!default_variant)
default_variant = rpmostreed_deployment_generate_blank_variant (); return FALSE;
rpmostree_os_set_default_deployment (RPMOSTREE_OS (self), }
default_variant); else
default_variant = g_variant_ref (booted_variant); /* Default to booted */
rpmostree_os_set_default_deployment (RPMOSTREE_OS (self), default_variant);
GVariant *rollback_variant = NULL; /* Floating */
if (rollback_deployment)
{
rollback_variant = rpmostreed_deployment_generate_variant (ot_sysroot, rollback_deployment,
booted_id, ot_repo, error);
if (!rollback_variant) if (!rollback_variant)
return FALSE;
}
else
rollback_variant = rpmostreed_deployment_generate_blank_variant (); rollback_variant = rpmostreed_deployment_generate_blank_variant ();
rpmostree_os_set_rollback_deployment (RPMOSTREE_OS (self), rpmostree_os_set_rollback_deployment (RPMOSTREE_OS (self), rollback_variant);
rollback_variant);
if (!refresh_cached_update (self, error)) if (!refresh_cached_update (self, error))
return FALSE; return FALSE;