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

lib/repo-refs: Fix resolving collection-refs 

My last commit "lib/repo-refs: Resolve collection-refs in-memory and in
parent repos" changed ostree_repo_resolve_collection_ref() to check the
in-memory set of refs *after* failing to find the ref on disk but that's
not what we want. We want to use the in-memory set of refs first,
because those are the most up to date commits, and then fall back to the
on-disk repo and finally fall back to checking any parent repo. This
commit makes such a change to the order of operations, which is
consistent with how ostree_repo_resolve_rev() works.

Aside from this change being logical, it also fixes some unit test
failures on an unmerged branch of flatpak:
https://github.com/flatpak/flatpak/pull/2705

Also, tweak the comments here.

Closes: #1825
Approved by: jlebon
This commit is contained in:
Matthew Leeds 2019-02-20 13:18:31 -08:00 committed by Atomic Bot
parent a8754ae370
commit 23304b8c15
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/libostree/ostree-repo-refs.c
View File

@ -525,23 +525,17 @@ ostree_repo_resolve_collection_ref (OstreeRepo *self,
GCancellable *cancellable, GCancellable *cancellable,
GError **error) GError **error)
{ {
g_autofree char *ret_contents = NULL;
g_return_val_if_fail (OSTREE_IS_REPO (self), FALSE); g_return_val_if_fail (OSTREE_IS_REPO (self), FALSE);
g_return_val_if_fail (ref != NULL, FALSE); g_return_val_if_fail (ref != NULL, FALSE);
g_return_val_if_fail (ref->collection_id != NULL && ref->ref_name != NULL, FALSE); g_return_val_if_fail (ref->collection_id != NULL && ref->ref_name != NULL, FALSE);
g_return_val_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable), FALSE); g_return_val_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable), FALSE);
g_return_val_if_fail (error == NULL || *error == NULL, FALSE); g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
g_autoptr(GHashTable) refs = NULL; /* (element-type OstreeCollectionRef utf8) */ /* Check for the ref in the current transaction in case it hasn't been
if (!ostree_repo_list_collection_refs (self, ref->collection_id, &refs, * written to disk, to match the behavior of ostree_repo_resolve_rev() */
OSTREE_REPO_LIST_REFS_EXT_NONE, if (self->in_transaction)
cancellable, error))
return FALSE;
g_autofree char *ret_contents = g_strdup (g_hash_table_lookup (refs, ref));
/* Check for refs in the current transaction that haven't been written to
* disk, to match the behavior of ostree_repo_resolve_rev() */
if (ret_contents == NULL && self->in_transaction)
{ {
g_mutex_lock (&self->txn_lock); g_mutex_lock (&self->txn_lock);
if (self->txn.collection_refs) if (self->txn.collection_refs)
@ -549,7 +543,19 @@ ostree_repo_resolve_collection_ref (OstreeRepo *self,
g_mutex_unlock (&self->txn_lock); g_mutex_unlock (&self->txn_lock);
} }
/* Check for refs in the parent repo */ /* Check for the ref on disk in the repo */
if (ret_contents == NULL)
{
g_autoptr(GHashTable) refs = NULL; /* (element-type OstreeCollectionRef utf8) */
if (!ostree_repo_list_collection_refs (self, ref->collection_id, &refs,
OSTREE_REPO_LIST_REFS_EXT_NONE,
cancellable, error))
return FALSE;
ret_contents = g_strdup (g_hash_table_lookup (refs, ref));
}
/* Check for the ref in the parent repo */
if (ret_contents == NULL && self->parent_repo != NULL) if (ret_contents == NULL && self->parent_repo != NULL)
{ {
if (!ostree_repo_resolve_collection_ref (self->parent_repo, if (!ostree_repo_resolve_collection_ref (self->parent_repo,