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

pull: Recover from missing commits in recursive pulls 

When traversing parents, do not fail on a missing commit.  We may
be pulling from a partial repository that ends in a dangling parent
reference.
This commit is contained in:
Matthew Barnes 2015-09-24 10:43:56 -04:00
parent bab6503b69
commit 0b795785dd
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -778,14 +778,24 @@ meta_fetch_on_complete (GObject *object,
temp_path = _ostree_fetcher_request_uri_with_partial_finish ((OstreeFetcher*)object, result, error); temp_path = _ostree_fetcher_request_uri_with_partial_finish ((OstreeFetcher*)object, result, error);
if (!temp_path) if (!temp_path)
{ {
if (!g_error_matches (local_error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND)) if (g_error_matches (local_error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND))
goto out;
else if (fetch_data->is_detached_meta)
{ {
/* There isn't any detached metadata, just fetch the commit */ if (fetch_data->is_detached_meta)
g_clear_error (&local_error); {
if (!fetch_data->object_is_stored) /* There isn't any detached metadata, just fetch the commit */
enqueue_one_object_request (pull_data, checksum, objtype, FALSE, FALSE); g_clear_error (&local_error);
if (!fetch_data->object_is_stored)
enqueue_one_object_request (pull_data, checksum, objtype, FALSE, FALSE);
}
/* When traversing parents, do not fail on a missing commit.
* We may be pulling from a partial repository that ends in
* a dangling parent reference. */
else if (objtype == OSTREE_OBJECT_TYPE_COMMIT &&
pull_data->maxdepth != 0)
{
g_clear_error (&local_error);
}
} }
goto out; goto out;