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

pull code: clean up mirrorlist hack 

While converting the mirrorlist code from using GSList to GPtrArray, I
completely missed the fact that there is now a much cleaner way to do
this.

Closes: #484
Approved by: cgwalters
This commit is contained in:
Jonathan Lebon 2016-08-31 13:16:36 -04:00 committed by Atomic Bot
parent 661e4636f5
commit 3b55db9661
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2471,9 +2471,10 @@ ostree_repo_pull_with_options (OstreeRepo *self,
goto out; goto out;
if (contenturl == NULL) if (contenturl == NULL)
/* this is a bit hacky but greatly simplifies coding elsewhere; we take {
* care in the out path to not double free if they're the same list */ pull_data->content_mirrorlist =
pull_data->content_mirrorlist = pull_data->meta_mirrorlist; g_ptr_array_ref (pull_data->meta_mirrorlist);
}
else else
{ {
if (g_str_has_prefix (contenturl, "mirrorlist=")) if (g_str_has_prefix (contenturl, "mirrorlist="))
@ -3026,10 +3027,8 @@ ostree_repo_pull_with_options (OstreeRepo *self,
g_clear_object (&pull_data->cancellable); g_clear_object (&pull_data->cancellable);
g_clear_object (&pull_data->remote_repo_local); g_clear_object (&pull_data->remote_repo_local);
g_free (pull_data->remote_name); g_free (pull_data->remote_name);
if (pull_data->content_mirrorlist != pull_data->meta_mirrorlist)
g_clear_pointer (&pull_data->content_mirrorlist, (GDestroyNotify) g_ptr_array_unref);
/* we clear this *after* clearing content_mirrorlist to avoid unref'ing twice */
g_clear_pointer (&pull_data->meta_mirrorlist, (GDestroyNotify) g_ptr_array_unref); g_clear_pointer (&pull_data->meta_mirrorlist, (GDestroyNotify) g_ptr_array_unref);
g_clear_pointer (&pull_data->content_mirrorlist, (GDestroyNotify) g_ptr_array_unref);
g_clear_pointer (&pull_data->summary_data, (GDestroyNotify) g_bytes_unref); g_clear_pointer (&pull_data->summary_data, (GDestroyNotify) g_bytes_unref);
g_clear_pointer (&pull_data->summary_data_sig, (GDestroyNotify) g_bytes_unref); g_clear_pointer (&pull_data->summary_data_sig, (GDestroyNotify) g_bytes_unref);
g_clear_pointer (&pull_data->summary, (GDestroyNotify) g_variant_unref); g_clear_pointer (&pull_data->summary, (GDestroyNotify) g_variant_unref);