packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libostree/upgrader: Throw an error if osname is empty 

This shouldn't happen; I'm just adding the check to force a rebuild.
This commit is contained in:
Colin Walters 2014-03-25 15:47:20 -04:00
parent 7baa600e23
commit 90883674a9
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libostree/ostree-sysroot-upgrader.c
View File

@ -115,6 +115,12 @@ ostree_sysroot_upgrader_initable_init (GInitable *initable,
g_assert (booted_deployment); g_assert (booted_deployment);
self->osname = g_strdup (ostree_deployment_get_osname (booted_deployment)); self->osname = g_strdup (ostree_deployment_get_osname (booted_deployment));
} }
else if (self->osname[0] == '\0')
{
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
"Invalid empty osname");
goto out;
}
self->merge_deployment = ostree_sysroot_get_merge_deployment (self->sysroot, self->osname); self->merge_deployment = ostree_sysroot_get_merge_deployment (self->sysroot, self->osname);
if (self->merge_deployment == NULL) if (self->merge_deployment == NULL)