forked from Mirrors/flatpak-builder
parent
289ae4474b
commit
c14fbc3efb
|
@ -1083,9 +1083,9 @@ flatpak_dir_deploy_appstream (FlatpakDir *self,
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!gs_file_rename (active_tmp_link,
|
if (!flatpak_file_rename (active_tmp_link,
|
||||||
active_link,
|
active_link,
|
||||||
cancellable, error))
|
cancellable, error))
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
if (old_checksum != NULL &&
|
if (old_checksum != NULL &&
|
||||||
|
@ -1900,9 +1900,9 @@ flatpak_dir_set_active (FlatpakDir *self,
|
||||||
if (!g_file_make_symbolic_link (active_tmp_link, checksum, cancellable, error))
|
if (!g_file_make_symbolic_link (active_tmp_link, checksum, cancellable, error))
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
if (!gs_file_rename (active_tmp_link,
|
if (!flatpak_file_rename (active_tmp_link,
|
||||||
active_link,
|
active_link,
|
||||||
cancellable, error))
|
cancellable, error))
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -3720,9 +3720,9 @@ flatpak_dir_undeploy (FlatpakDir *self,
|
||||||
glnx_gen_temp_name (tmpname);
|
glnx_gen_temp_name (tmpname);
|
||||||
removed_subdir = g_file_get_child (removed_dir, tmpname);
|
removed_subdir = g_file_get_child (removed_dir, tmpname);
|
||||||
|
|
||||||
if (!gs_file_rename (checkoutdir,
|
if (!flatpak_file_rename (checkoutdir,
|
||||||
removed_subdir,
|
removed_subdir,
|
||||||
cancellable, error))
|
cancellable, error))
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
if (force_remove || !dir_is_locked (removed_subdir))
|
if (force_remove || !dir_is_locked (removed_subdir))
|
||||||
|
|
|
@ -1659,6 +1659,24 @@ flatpak_rm_rf (GFile *dir,
|
||||||
cancellable, error);
|
cancellable, error);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
gboolean flatpak_file_rename (GFile *from,
|
||||||
|
GFile *to,
|
||||||
|
GCancellable *cancellable,
|
||||||
|
GError **error)
|
||||||
|
{
|
||||||
|
if (g_cancellable_set_error_if_cancelled (cancellable, error))
|
||||||
|
return FALSE;
|
||||||
|
|
||||||
|
if (rename (flatpak_file_get_path_cached (from),
|
||||||
|
flatpak_file_get_path_cached (to)) < 0)
|
||||||
|
{
|
||||||
|
glnx_set_error_from_errno (error);
|
||||||
|
return FALSE;
|
||||||
|
}
|
||||||
|
|
||||||
|
return TRUE;
|
||||||
|
}
|
||||||
|
|
||||||
gboolean
|
gboolean
|
||||||
flatpak_variant_save (GFile *dest,
|
flatpak_variant_save (GFile *dest,
|
||||||
GVariant *variant,
|
GVariant *variant,
|
||||||
|
|
|
@ -290,6 +290,11 @@ gboolean flatpak_rm_rf (GFile *dir,
|
||||||
GCancellable *cancellable,
|
GCancellable *cancellable,
|
||||||
GError **error);
|
GError **error);
|
||||||
|
|
||||||
|
gboolean flatpak_file_rename (GFile *from,
|
||||||
|
GFile *to,
|
||||||
|
GCancellable *cancellable,
|
||||||
|
GError **error);
|
||||||
|
|
||||||
#define flatpak_autorm_rf _GLIB_CLEANUP (g_autoptr_cleanup_generic_gfree)
|
#define flatpak_autorm_rf _GLIB_CLEANUP (g_autoptr_cleanup_generic_gfree)
|
||||||
|
|
||||||
static inline void
|
static inline void
|
||||||
|
|
Loading…
Reference in New Issue