[ostree] deploy: Add an assertion that deployment directory exists
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ostree] deploy: Add an assertion that deployment directory exists
- Date: Thu, 3 Apr 2014 22:30:25 +0000 (UTC)
commit 890d685c7976fa7c7badd9ec42189e577824493a
Author: Colin Walters <walters verbum org>
Date: Thu Apr 3 18:29:07 2014 -0400
deploy: Add an assertion that deployment directory exists
I may be seeing something going wrong in rpm-ostree, just adding this
assertion for my own sanity.
src/libostree/ostree-sysroot-deploy.c | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
---
diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c
index 1aac2cd..87346b7 100644
--- a/src/libostree/ostree-sysroot-deploy.c
+++ b/src/libostree/ostree-sysroot-deploy.c
@@ -1133,9 +1133,19 @@ ostree_sysroot_write_deployments (OstreeSysroot *self,
for (i = 0; i < new_deployments->len; i++)
{
OstreeDeployment *deployment = new_deployments->pdata[i];
+ gs_unref_object GFile *deployment_root = NULL;
if (deployment == self->booted_deployment)
found_booted_deployment = TRUE;
+
+ deployment_root = ostree_sysroot_get_deployment_directory (self, deployment);
+ if (!g_file_query_exists (deployment_root, NULL))
+ {
+ g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
+ "Unable to find expected deployment root: %s",
+ gs_file_get_path_cached (deployment_root));
+ goto out;
+ }
ostree_deployment_set_index (deployment, i);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]