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

deploy: Deploy to temporary directory and rename at the end

tingping/wmclass
Alexander Larsson 2016-04-27 12:58:31 +02:00
parent 64669a9a96
commit ffb6670332
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2353,6 +2353,7 @@ xdg_app_dir_deploy (XdgAppDir *self,
g_autoptr(GFileInfo) file_info = NULL;
g_autoptr(GFile) deploy_base = NULL;
g_autoptr(GFile) checkoutdir = NULL;
g_autoptr(GFile) real_checkoutdir = NULL;
g_autoptr(GFile) dotref = NULL;
g_autoptr(GFile) files_etc = NULL;
g_autoptr(GFile) metadata = NULL;
@ -2362,6 +2363,8 @@ xdg_app_dir_deploy (XdgAppDir *self,
g_autoptr(GKeyFile) keyfile = NULL;
guint64 installed_size = 0;
const char *checksum;
g_autoptr(GFile) tmp_dir_template = NULL;
g_autofree char *tmp_dir_path = NULL;
if (!xdg_app_dir_ensure_repo (self, cancellable, error))
return FALSE;
@ -2393,8 +2396,8 @@ xdg_app_dir_deploy (XdgAppDir *self,
return xdg_app_fail (error, "%s is not available", ref);
}
checkoutdir = g_file_get_child (deploy_base, checksum);
if (g_file_query_exists (checkoutdir, cancellable))
real_checkoutdir = g_file_get_child (deploy_base, checksum);
if (g_file_query_exists (real_checkoutdir, cancellable))
{
g_set_error (error, XDG_APP_DIR_ERROR,
XDG_APP_DIR_ERROR_ALREADY_DEPLOYED,
@ -2402,6 +2405,18 @@ xdg_app_dir_deploy (XdgAppDir *self,
return FALSE;
}
g_autofree char *template = g_strdup_printf (".%s-XXXXXX", checksum);
tmp_dir_template = g_file_get_child (deploy_base, template);
tmp_dir_path = g_file_get_path (tmp_dir_template);
if (g_mkdtemp (tmp_dir_path) == NULL)
{
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "Can't create deploy directory");
return FALSE;
}
checkoutdir = g_file_new_for_path (tmp_dir_path);
if (!ostree_repo_read_commit (self->repo, checksum, &root, NULL, cancellable, error))
{
g_prefix_error (error, "Failed to read commit %s: ", checksum);
@ -2421,7 +2436,7 @@ xdg_app_dir_deploy (XdgAppDir *self,
{
if (!ostree_repo_checkout_tree (self->repo,
OSTREE_REPO_CHECKOUT_MODE_USER,
OSTREE_REPO_CHECKOUT_OVERWRITE_NONE,
OSTREE_REPO_CHECKOUT_OVERWRITE_UNION_FILES,
checkoutdir,
OSTREE_REPO_FILE (root), file_info,
cancellable, error))
@ -2562,6 +2577,10 @@ xdg_app_dir_deploy (XdgAppDir *self,
if (!xdg_app_variant_save (deploy_data_file, deploy_data, cancellable, error))
return FALSE;
if (!g_file_move (checkoutdir, real_checkoutdir, G_FILE_COPY_NO_FALLBACK_FOR_MOVE,
cancellable, NULL, NULL, error))
return FALSE;
if (!xdg_app_dir_set_active (self, ref, checksum, cancellable, error))
return FALSE;