marko10_000
/
flatpak-builder
forked from Mirrors/flatpak-builder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

appstream: Don't try to remove old appstream if it doesn't exist

tingping/wmclass
Alexander Larsson 2016-01-19 22:05:16 +01:00
parent 9a185947a3
commit c6df1665a6
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common/xdg-app-dir.c
View File

@ -647,7 +647,6 @@ xdg_app_dir_update_appstream (XdgAppDir *self,
remote_dir = g_file_get_child (appstream_dir, remote);
arch_dir = g_file_get_child (remote_dir, arch);
checkout_dir = g_file_get_child (arch_dir, new_checksum);
old_checkout_dir = g_file_get_child (arch_dir, old_checksum);
if (old_checksum != NULL && new_checksum != NULL &&
strcmp (old_checksum, new_checksum) == 0 &&
@ -695,9 +694,13 @@ xdg_app_dir_update_appstream (XdgAppDir *self,
cancellable, error))
return FALSE;
if (g_strcmp0 (old_checksum, new_checksum) != 0 &&
!gs_shutil_rm_rf (old_checkout_dir, cancellable, &tmp_error))
g_warning ("Unable to remove old appstream checkout: %s\n", tmp_error->message);
if (old_checksum != NULL &&
g_strcmp0 (old_checksum, new_checksum) != 0)
{
old_checkout_dir = g_file_get_child (arch_dir, old_checksum);
if (!gs_shutil_rm_rf (old_checkout_dir, cancellable, &tmp_error))
g_warning ("Unable to remove old appstream checkout: %s\n", tmp_error->message);
}
if (out_changed)
*out_changed = TRUE;