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

Revert "lib: Allow passing NULL for remote name in update_appstream" 

This reverts commit 9a185947a3.

This was problematic wrt how partial errors are reported
tingping/wmclass
Alexander Larsson 2016-01-19 22:06:06 +01:00
parent c6df1665a6
commit df44834b0c
1 changed files with 8 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
lib/xdg-app-installation.c
View File

@ -1133,7 +1133,7 @@ no_progress_cb (OstreeAsyncProgress *progress, gpointer user_data)
/**
* xdg_app_installation_update_appstream_sync:
* @self: a #XdgAppInstallation
* @remote_name: the name of the remote, or %NULL for all
* @remote_name: the name of the remote
* @arch: Architecture to update, or %NULL for the local machine arch
* @out_changed: (nullable): Set to %TRUE if the contents of the appstream changed, %FALSE if nothing changed
* @cancellable: (nullable): a #GCancellable
@ -1156,8 +1156,6 @@ xdg_app_installation_update_appstream_sync (XdgAppInstallation *self,
g_autoptr(OstreeAsyncProgress) ostree_progress = NULL;
g_autoptr(GMainContext) main_context = NULL;
gboolean res;
g_auto(GStrv) remote_names = NULL;
/* Pull, prune, etc are not threadsafe, so we work on a copy */
dir_clone = xdg_app_dir_clone (priv->dir);
@ -1171,26 +1169,13 @@ xdg_app_installation_update_appstream_sync (XdgAppInstallation *self,
ostree_progress = ostree_async_progress_new_and_connect (no_progress_cb, NULL);
if (remote_name)
{
remote_names = g_new0 (char *, 2);
remote_names[0] = g_strdup (remote_name);
}
else
{
remote_names = xdg_app_dir_list_remotes (priv->dir, cancellable, error);
if (remote_names == NULL)
return FALSE;
}
for (i = 0; remote_names[i] != NULL; i++)
res = xdg_app_dir_update_appstream (dir_clone,
remote_names[i],
arch,
out_changed,
ostree_progress,
cancellable,
error);
res = xdg_app_dir_update_appstream (dir_clone,
remote_name,
arch,
out_changed,
ostree_progress,
cancellable,
error);
g_main_context_pop_thread_default (main_context);