[ostree] Update to the latest libgsystem
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ostree] Update to the latest libgsystem
- Date: Tue, 8 Jan 2013 12:04:45 +0000 (UTC)
commit ecc0d1e07f401d9b832c17542a41079b5609bffe
Author: Colin Walters <walters verbum org>
Date: Tue Jan 8 07:04:29 2013 -0500
Update to the latest libgsystem
src/libgsystem | 2 +-
src/ostree/ot-admin-builtin-update-kernel.c | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/src/libgsystem b/src/libgsystem
index fe898ee..ba7c19c 160000
--- a/src/libgsystem
+++ b/src/libgsystem
@@ -1 +1 @@
-Subproject commit fe898ee93bdc8a625c460876c8b49428c8977219
+Subproject commit ba7c19cd3b44902ba1dd9bb0fba43293b43abb0b
diff --git a/src/ostree/ot-admin-builtin-update-kernel.c b/src/ostree/ot-admin-builtin-update-kernel.c
index c7f95b7..6b398d9 100644
--- a/src/ostree/ot-admin-builtin-update-kernel.c
+++ b/src/ostree/ot-admin-builtin-update-kernel.c
@@ -120,7 +120,8 @@ setup_kernel (OtAdminUpdateKernel *self,
prefix = g_strndup (kernel_name, release - kernel_name);
self->kernel_path = ot_gfile_get_child_strconcat (self->boot_ostree_dir, prefix, "-", self->release, NULL);
- if (!gs_file_linkcopy_sync_data (src_kernel_path, self->kernel_path, cancellable, error))
+ if (!gs_file_linkcopy_sync_data (src_kernel_path, self->kernel_path, G_FILE_COPY_OVERWRITE,
+ cancellable, error))
goto out;
g_print ("ostadmin: Deploying kernel %s\n", gs_file_get_path_cached (self->kernel_path));
@@ -223,7 +224,8 @@ update_initramfs (OtAdminUpdateKernel *self,
goto out;
}
- if (!gs_file_linkcopy_sync_data (initramfs_tmp_file, initramfs_file, cancellable, error))
+ if (!gs_file_linkcopy_sync_data (initramfs_tmp_file, initramfs_file, G_FILE_COPY_OVERWRITE,
+ cancellable, error))
goto out;
/* In the fuse case, we need to chown after copying */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]