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

deploy: Clean up leftover state before creating new directories 

This fixes a regression introduced with https://git.gnome.org/browse/ostree/commit/?id=7baa600e237b326899de2899a9bc54a6b863943c

The original code in "ostree admin upgrade" had a comment:

 /* Here we perform cleanup of any leftover data from previous
  * partial failures. This avoids having to call gs_shutil_rm_rf()
  * at random points throughout the process. */

But since I deleted that initial cleanup call, we *do* need to do the
cleanup during the process run.  It turns out there are only a few
places this is necessary.

https://bugzilla.gnome.org/show_bug.cgi?id=733030
This commit is contained in:
Colin Walters 2014-07-10 15:19:50 -04:00
parent 7b01bd2e43
commit 12e3ed83d3
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/libostree/ostree-sysroot-deploy.c
View File

@ -1072,6 +1072,9 @@ swap_bootlinks (OstreeSysroot *self,
ostree_subbootdir_name = g_strdup_printf ("boot.%d.%d", bootversion, new_subbootversion); ostree_subbootdir_name = g_strdup_printf ("boot.%d.%d", bootversion, new_subbootversion);
ostree_subbootdir = g_file_resolve_relative_path (ostree_dir, ostree_subbootdir_name); ostree_subbootdir = g_file_resolve_relative_path (ostree_dir, ostree_subbootdir_name);
if (!gs_shutil_rm_rf (ostree_subbootdir, cancellable, error))
goto out;
if (!ot_util_ensure_directory_and_fsync (ostree_subbootdir, cancellable, error)) if (!ot_util_ensure_directory_and_fsync (ostree_subbootdir, cancellable, error))
goto out; goto out;
@ -1526,6 +1529,8 @@ ostree_sysroot_write_deployments (OstreeSysroot *self,
new_loader_entries_dir = ot_gfile_resolve_path_printf (self->path, "boot/loader.%d/entries", new_loader_entries_dir = ot_gfile_resolve_path_printf (self->path, "boot/loader.%d/entries",
new_bootversion); new_bootversion);
if (!gs_shutil_rm_rf (new_loader_entries_dir, cancellable, error))
goto out;
if (!ot_util_ensure_directory_and_fsync (new_loader_entries_dir, cancellable, error)) if (!ot_util_ensure_directory_and_fsync (new_loader_entries_dir, cancellable, error))
goto out; goto out;