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

pull: Write commitpartial files for local imports too 

Just like HTTP fetches, these can be interrupted, so we need to write
the commitpartial files.

Closes: #324
Approved by: yuqi-zhang
This commit is contained in:
Colin Walters 2016-06-07 09:50:58 -04:00 committed by Atomic Bot
parent 02a2b689dd
commit 073c34ca08
1 changed files with 34 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/libostree/ostree-repo-pull.c
View File

@ -415,6 +415,26 @@ fetch_uri_contents_utf8_sync (OtPullData *pull_data,
return ret; return ret;
} }
static gboolean
write_commitpartial_for (OtPullData *pull_data,
const char *checksum,
GError **error)
{
g_autofree char *commitpartial_path = _ostree_get_commitpartial_path (checksum);
glnx_fd_close int fd = -1;
fd = openat (pull_data->repo->repo_dir_fd, commitpartial_path, O_EXCL | O_CREAT | O_WRONLY | O_CLOEXEC | O_NOCTTY, 0600);
if (fd == -1)
{
if (errno != EEXIST)
{
glnx_set_error_from_errno (error);
return FALSE;
}
}
return TRUE;
}
static void static void
enqueue_one_object_request (OtPullData *pull_data, enqueue_one_object_request (OtPullData *pull_data,
const char *checksum, const char *checksum,
@ -889,19 +909,9 @@ meta_fetch_on_complete (GObject *object,
/* Write the commitpartial file now while we're still fetching data */ /* Write the commitpartial file now while we're still fetching data */
if (objtype == OSTREE_OBJECT_TYPE_COMMIT) if (objtype == OSTREE_OBJECT_TYPE_COMMIT)
{ {
g_autofree char *commitpartial_path = _ostree_get_commitpartial_path (checksum); if (!write_commitpartial_for (pull_data, checksum, error))
glnx_fd_close int fd = -1;
fd = openat (pull_data->repo->repo_dir_fd, commitpartial_path, O_EXCL | O_CREAT | O_WRONLY | O_CLOEXEC | O_NOCTTY, 0600);
if (fd == -1)
{
if (errno != EEXIST)
{
glnx_set_error_from_errno (error);
goto out; goto out;
} }
}
}
ostree_repo_write_metadata_async (pull_data->repo, objtype, checksum, metadata, ostree_repo_write_metadata_async (pull_data->repo, objtype, checksum, metadata,
pull_data->cancellable, pull_data->cancellable,
@ -1205,11 +1215,18 @@ scan_one_metadata_object_c (OtPullData *pull_data,
if (pull_data->remote_repo_local) if (pull_data->remote_repo_local)
{ {
if (!is_stored && if (!is_stored)
!ostree_repo_import_object_from_with_trust (pull_data->repo, pull_data->remote_repo_local, {
if (!ostree_repo_import_object_from_with_trust (pull_data->repo, pull_data->remote_repo_local,
objtype, tmp_checksum, !pull_data->is_untrusted, objtype, tmp_checksum, !pull_data->is_untrusted,
cancellable, error)) cancellable, error))
goto out; goto out;
if (objtype == OSTREE_OBJECT_TYPE_COMMIT)
{
if (!write_commitpartial_for (pull_data, tmp_checksum, error))
goto out;
}
}
is_stored = TRUE; is_stored = TRUE;
is_requested = TRUE; is_requested = TRUE;
} }