summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
m---------libglnx0
-rw-r--r--src/libostree/ostree-repo-checkout.c6
-rw-r--r--src/libostree/ostree-repo-commit.c4
-rw-r--r--src/libostree/ostree-repo.c4
-rw-r--r--src/libostree/ostree-sepolicy.c2
-rw-r--r--src/libostree/ostree-sysroot-deploy.c4
-rw-r--r--src/libostree/ostree-sysroot.c4
-rw-r--r--src/ostree/ot-admin-builtin-undeploy.c2
-rw-r--r--src/ostree/ot-main.c2
-rw-r--r--tests/libostreetest.c2
10 files changed, 15 insertions, 15 deletions
diff --git a/libglnx b/libglnx
-Subproject 3a4d0f4684f4653338c4756c8a1abfc6b573846
+Subproject 32231fdb5273dd2a812c61549d6c0e681c0f5d5
diff --git a/src/libostree/ostree-repo-checkout.c b/src/libostree/ostree-repo-checkout.c
index 236f514b..f6e91498 100644
--- a/src/libostree/ostree-repo-checkout.c
+++ b/src/libostree/ostree-repo-checkout.c
@@ -516,7 +516,7 @@ checkout_one_file_at (OstreeRepo *repo,
if (!checkout_object_for_uncompressed_cache (repo, loose_path_buf,
source_info, input,
cancellable, error))
- return g_prefix_error (error, "Unpacking loose object %s: ", checksum), FALSE;
+ return glnx_prefix_error (error, "Unpacking loose object %s", checksum);
g_clear_object (&input);
@@ -549,7 +549,7 @@ checkout_one_file_at (OstreeRepo *repo,
destination_dfd, destination_name,
FALSE, &hardlink_res,
cancellable, error))
- return g_prefix_error (error, "Using new cached uncompressed hardlink of %s to %s: ", checksum, destination_name), FALSE;
+ return glnx_prefix_error (error, "Using new cached uncompressed hardlink of %s to %s", checksum, destination_name);
need_copy = (hardlink_res == HARDLINK_RESULT_NOT_SUPPORTED);
}
@@ -571,7 +571,7 @@ checkout_one_file_at (OstreeRepo *repo,
if (!create_file_copy_from_input_at (repo, options, state, source_info, xattrs, input,
destination_dfd, destination_name,
cancellable, error))
- return g_prefix_error (error, "Copy checkout of %s to %s: ", checksum, destination_name), FALSE;
+ return glnx_prefix_error (error, "Copy checkout of %s to %s", checksum, destination_name);
if (input)
{
diff --git a/src/libostree/ostree-repo-commit.c b/src/libostree/ostree-repo-commit.c
index 2e9f9243..ce45a911 100644
--- a/src/libostree/ostree-repo-commit.c
+++ b/src/libostree/ostree-repo-commit.c
@@ -2009,13 +2009,13 @@ ostree_repo_read_commit_detached_metadata (OstreeRepo *self,
!ot_util_variant_map_at (self->commit_stagedir_fd, buf,
G_VARIANT_TYPE ("a{sv}"),
OT_VARIANT_MAP_ALLOW_NOENT | OT_VARIANT_MAP_TRUSTED, &ret_metadata, error))
- return g_prefix_error (error, "Unable to read existing detached metadata: "), FALSE;
+ return glnx_prefix_error (error, "Unable to read existing detached metadata");
if (ret_metadata == NULL &&
!ot_util_variant_map_at (self->objects_dir_fd, buf,
G_VARIANT_TYPE ("a{sv}"),
OT_VARIANT_MAP_ALLOW_NOENT | OT_VARIANT_MAP_TRUSTED, &ret_metadata, error))
- return g_prefix_error (error, "Unable to read existing detached metadata: "), FALSE;
+ return glnx_prefix_error (error, "Unable to read existing detached metadata");
if (ret_metadata == NULL && self->parent_repo)
return ostree_repo_read_commit_detached_metadata (self->parent_repo,
diff --git a/src/libostree/ostree-repo.c b/src/libostree/ostree-repo.c
index 93e1888e..b7d1324c 100644
--- a/src/libostree/ostree-repo.c
+++ b/src/libostree/ostree-repo.c
@@ -3917,7 +3917,7 @@ ostree_repo_sign_commit (OstreeRepo *self,
g_autoptr(GVariant) commit_variant = NULL;
if (!ostree_repo_load_variant (self, OSTREE_OBJECT_TYPE_COMMIT,
commit_checksum, &commit_variant, error))
- return g_prefix_error (error, "Failed to read commit: "), FALSE;
+ return glnx_prefix_error (error, "Failed to read commit");
g_autoptr(GVariant) old_metadata = NULL;
if (!ostree_repo_read_commit_detached_metadata (self,
@@ -3925,7 +3925,7 @@ ostree_repo_sign_commit (OstreeRepo *self,
&old_metadata,
cancellable,
error))
- return g_prefix_error (error, "Failed to read detached metadata: "), FALSE;
+ return glnx_prefix_error (error, "Failed to read detached metadata");
commit_data = g_variant_get_data_as_bytes (commit_variant);
diff --git a/src/libostree/ostree-sepolicy.c b/src/libostree/ostree-sepolicy.c
index dd0567aa..7387ea0f 100644
--- a/src/libostree/ostree-sepolicy.c
+++ b/src/libostree/ostree-sepolicy.c
@@ -383,7 +383,7 @@ initable_init (GInitable *initable,
freecon (con);
if (!get_policy_checksum (&self->selinux_policy_csum, cancellable, error))
- return g_prefix_error (error, "While calculating SELinux checksum: "), FALSE;
+ return glnx_prefix_error (error, "While calculating SELinux checksum");
self->selinux_policy_name = g_steal_pointer (&policytype);
self->selinux_policy_root = g_object_ref (etc_selinux_dir);
diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c
index 57020fa8..b4a8ec0c 100644
--- a/src/libostree/ostree-sysroot-deploy.c
+++ b/src/libostree/ostree-sysroot-deploy.c
@@ -1306,7 +1306,7 @@ install_deployment_kernel (OstreeSysroot *sysroot,
contents = glnx_file_get_contents_utf8_at (deployment_dfd, "etc/os-release", NULL,
cancellable, error);
if (!contents)
- return g_prefix_error (error, "Reading /etc/os-release: "), FALSE;
+ return glnx_prefix_error (error, "Reading /etc/os-release");
}
}
else
@@ -1314,7 +1314,7 @@ install_deployment_kernel (OstreeSysroot *sysroot,
contents = glnx_file_get_contents_utf8_at (deployment_dfd, "usr/lib/os-release", NULL,
cancellable, error);
if (!contents)
- return g_prefix_error (error, "Reading /usr/lib/os-release: "), FALSE;
+ return glnx_prefix_error (error, "Reading /usr/lib/os-release");
}
g_autoptr(GHashTable) osrelease_values = parse_os_release (contents, "\n");
diff --git a/src/libostree/ostree-sysroot.c b/src/libostree/ostree-sysroot.c
index 67f940a8..510f2fb2 100644
--- a/src/libostree/ostree-sysroot.c
+++ b/src/libostree/ostree-sysroot.c
@@ -459,7 +459,7 @@ _ostree_sysroot_read_boot_loader_configs (OstreeSysroot *self,
glnx_unref_object OstreeBootconfigParser *config = ostree_bootconfig_parser_new ();
if (!ostree_bootconfig_parser_parse_at (config, dfd_iter.fd, dent->d_name, cancellable, error))
- return g_prefix_error (error, "Parsing %s: ", dent->d_name), FALSE;
+ return glnx_prefix_error (error, "Parsing %s", dent->d_name);
g_ptr_array_add (ret_loader_configs, g_object_ref (config));
}
@@ -533,7 +533,7 @@ parse_origin (OstreeSysroot *self,
return FALSE;
if (!g_key_file_load_from_data (ret_origin, origin_contents, -1, 0, error))
- return g_prefix_error (error, "Parsing %s: ", origin_path), FALSE;
+ return glnx_prefix_error (error, "Parsing %s", origin_path);
}
ot_transfer_out_value(out_origin, &ret_origin);
diff --git a/src/ostree/ot-admin-builtin-undeploy.c b/src/ostree/ot-admin-builtin-undeploy.c
index 4bf41d0c..00252c80 100644
--- a/src/ostree/ot-admin-builtin-undeploy.c
+++ b/src/ostree/ot-admin-builtin-undeploy.c
@@ -83,7 +83,7 @@ ot_admin_builtin_undeploy (int argc, char **argv, GCancellable *cancellable, GEr
ostree_deployment_get_deployserial (target_deployment));
if (!ostree_sysroot_cleanup (sysroot, cancellable, error))
- return g_prefix_error (error, "Performing final cleanup: "), FALSE;
+ return glnx_prefix_error (error, "Performing final cleanup");
return TRUE;
}
diff --git a/src/ostree/ot-main.c b/src/ostree/ot-main.c
index a5b630a0..9aca8287 100644
--- a/src/ostree/ot-main.c
+++ b/src/ostree/ot-main.c
@@ -377,7 +377,7 @@ ostree_ensure_repo_writable (OstreeRepo *repo,
GError **error)
{
if (!ostree_repo_is_writable (repo, error))
- return g_prefix_error (error, "Cannot write to repository: "), FALSE;
+ return glnx_prefix_error (error, "Cannot write to repository");
return TRUE;
}
diff --git a/tests/libostreetest.c b/tests/libostreetest.c
index cda1649d..2fb83f51 100644
--- a/tests/libostreetest.c
+++ b/tests/libostreetest.c
@@ -99,7 +99,7 @@ ot_test_setup_sysroot (GCancellable *cancellable,
{ g_autoptr(GString) buf = g_string_new ("mutable-deployments");
if (statfs ("/", &stbuf) < 0)
- return glnx_throw_errno (error), NULL;
+ return glnx_null_throw_errno (error);
/* Keep this in sync with the overlayfs bits in libtest.sh */
#ifndef OVERLAYFS_SUPER_MAGIC
#define OVERLAYFS_SUPER_MAGIC 0x794c7630
View Lorry Controller Status