mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-01-31 19:11:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

app/flatpak-builtins-update: skip refs from unreachable remotes

Browse Source 
Allow refs to be added to the update operation in "flatpak update" even if some
of the matching group have a missing remote. In the case this leaves the
transaction empty, the "nothing to do" error will be printed after the
transaction is run.
This commit is contained in:
Robert McQueen
2019-01-11 13:07:43 +00:00
parent 6f77da3499
commit 148db9eb5a
1 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
app/flatpak-builtins-update.c
View File

@@ -197,8 +197,18 @@ flatpak_builtin_update (int argc,
continue;
found = TRUE;
if (!flatpak_transaction_add_update (transaction, refs[i], (const char **) opt_subpaths, opt_commit, error))
return FALSE;
if (flatpak_transaction_add_update (transaction, refs[i], (const char **) opt_subpaths, opt_commit, error))
continue;
if (g_error_matches (*error, FLATPAK_ERROR, FLATPAK_ERROR_REMOTE_NOT_FOUND))
{
g_printerr (_("Unable to update %s: %s\n"), refs[i], (*error)->message);
g_clear_error (error);
}
else
{
return FALSE;
}
}
}
@@ -228,8 +238,18 @@ flatpak_builtin_update (int argc,
continue;
found = TRUE;
if (!flatpak_transaction_add_update (transaction, refs[i], (const char **) opt_subpaths, opt_commit, error))
return FALSE;
if (flatpak_transaction_add_update (transaction, refs[i], (const char **) opt_subpaths, opt_commit, error))
continue;
if (g_error_matches (*error, FLATPAK_ERROR, FLATPAK_ERROR_REMOTE_NOT_FOUND))
{
g_printerr (_("Unable to update %s: %s\n"), refs[i], (*error)->message);
g_clear_error (error);
}
else
{
return FALSE;
}
}
}
}