mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-04-16 13:00:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

Delete some unreachable ref-not-found code

Browse Source 
flatpak_remote_state_lookup_ref() always sets the error to
FLATPAK_ERROR_REF_NOT_FOUND when it returns FALSE.

Found by coverity CID 1514265

(cherry picked from commit 12ebf8fd9a)
This commit is contained in:
Phaedrus Leeds
2022-02-18 10:12:52 -06:00
committed by Phaedrus Leeds
parent 399710ada1
commit bf9a72a3be
2 changed files with 7 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/flatpak-builtins-remote-info.c
View File

@@ -149,17 +149,11 @@ flatpak_builtin_remote_info (int argc, char **argv, GCancellable *cancellable, G
{
if (opt_commit)
commit = g_strdup (opt_commit);
else
else if (!flatpak_remote_state_lookup_ref (state, flatpak_decomposed_get_ref (ref),
&commit, NULL, NULL, NULL, error))
{
flatpak_remote_state_lookup_ref (state, flatpak_decomposed_get_ref (ref), &commit, NULL, NULL, NULL, error);
if (commit == NULL)
{
if (error != NULL && *error == NULL)
flatpak_fail_error (error, FLATPAK_ERROR_REF_NOT_FOUND,
_("Couldn't find latest checksum for ref %s in remote %s"),
flatpak_decomposed_get_ref (ref), remote);
return FALSE;
}
g_assert (error == NULL || *error != NULL);
return FALSE;
}
}
else

14
common/flatpak-dir.c
View File

@@ -5898,18 +5898,10 @@ flatpak_dir_pull (FlatpakDir *self,
{
rev = g_strdup (opt_rev);
}
else
else if (!flatpak_remote_state_lookup_ref (state, ref, &rev, NULL, NULL, NULL, error))
{
flatpak_remote_state_lookup_ref (state, ref, &rev, NULL, NULL, NULL, error);
if (rev == NULL && error != NULL && *error == NULL)
flatpak_fail_error (error, FLATPAK_ERROR_REF_NOT_FOUND, _("Couldn't find latest checksum for ref %s in remote %s"),
ref, state->remote_name);
if (rev == NULL)
{
g_assert (error == NULL || *error != NULL);
return FALSE;
}
g_assert (error == NULL || *error != NULL);
return FALSE;
}
g_debug ("%s: Using commit %s for pull of ref %s from remote %s%s%s",