summaryrefslogtreecommitdiff
path: root/src/libostree/ostree-sysroot-upgrader.c
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2014-03-25 15:47:20 -0400
committerColin Walters <walters@verbum.org>2014-03-25 15:47:20 -0400
commit90883674a9dd57fa92bf98e9416c42ac268641b9 (patch)
tree4bc93dc0e2d493588fcb9b4bbc9b931c2a6cabef /src/libostree/ostree-sysroot-upgrader.c
parent7baa600e237b326899de2899a9bc54a6b863943c (diff)
downloadostree-90883674a9dd57fa92bf98e9416c42ac268641b9.tar.gz
libostree/upgrader: Throw an error if osname is empty
This shouldn't happen; I'm just adding the check to force a rebuild.
Diffstat (limited to 'src/libostree/ostree-sysroot-upgrader.c')
-rw-r--r--src/libostree/ostree-sysroot-upgrader.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/libostree/ostree-sysroot-upgrader.c b/src/libostree/ostree-sysroot-upgrader.c
index c565434f..573d3d2d 100644
--- a/src/libostree/ostree-sysroot-upgrader.c
+++ b/src/libostree/ostree-sysroot-upgrader.c
@@ -115,6 +115,12 @@ ostree_sysroot_upgrader_initable_init (GInitable *initable,
g_assert (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);
if (self->merge_deployment == NULL)