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

Make sure we export files during install 

is_data was never set to true, so we didn't run the exports
during install.
tingping/wmclass
Alexander Larsson 2016-02-09 10:32:36 +01:00
parent 9c6d6242a9
commit 8f6e6c0dab
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
common/xdg-app-dir.c
View File

@ -2361,17 +2361,25 @@ xdg_app_dir_find_remote_ref (XdgAppDir *self,
if (app_ref &&
ostree_repo_resolve_rev (self->repo, app_ref_with_remote,
FALSE, NULL, NULL))
return g_steal_pointer (&app_ref);
{
if (is_app)
*is_app = TRUE;
return g_steal_pointer (&app_ref);
}
if (runtime_ref &&
ostree_repo_resolve_rev (self->repo, runtime_ref_with_remote,
FALSE, NULL, NULL))
return g_steal_pointer (&runtime_ref);
{
if (is_app)
*is_app = FALSE;
return g_steal_pointer (&runtime_ref);
}
if (!ostree_repo_remote_fetch_summary (self->repo, remote,
&summary_bytes, NULL,
cancellable, error))
return FALSE;
return NULL;
if (summary_bytes == NULL)
{
@ -2384,10 +2392,18 @@ xdg_app_dir_find_remote_ref (XdgAppDir *self,
refs = g_variant_get_child_value (summary, 0);
if (app_ref && xdg_app_variant_bsearch_str (refs, app_ref, &pos))
return g_steal_pointer (&app_ref);
{
if (is_app)
*is_app = TRUE;
return g_steal_pointer (&app_ref);
}
if (runtime_ref && xdg_app_variant_bsearch_str (refs, runtime_ref, &pos))
return g_steal_pointer (&runtime_ref);
{
if (is_app)
*is_app = TRUE;
return g_steal_pointer (&runtime_ref);
}
g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND,
"Can't find %s %s in remote %s", name, opt_branch ? opt_branch : "master", remote);