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

dir: Ensure we return on pull error to avoid error-overwrites 

Looking at the git history, this code originally retried on
some cases for pull, then stopped doing so, then a later commit
added code after it, which made it incorrect.

Just do an early return again and drop the `res` variable.
tingping/wmclass
Colin Walters 2017-06-07 15:40:17 -04:00 committed by Alexander Larsson
parent e5aa73f4a5
commit 4714f55ebd
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/flatpak-dir.c
View File

@ -1798,7 +1798,6 @@ repo_pull_one_dir (OstreeRepo *self,
g_autoptr(GVariant) new_commit = NULL;
const char *refs_to_fetch[2];
const char *revs_to_fetch[2];
gboolean res;
guint32 update_freq = 0;
g_variant_builder_init (&builder, G_VARIANT_TYPE ("a{sv}"));
@ -1847,8 +1846,9 @@ repo_pull_one_dir (OstreeRepo *self,
!ostree_repo_load_commit (self, current_checksum, &old_commit, NULL, error))
return FALSE;
res = ostree_repo_pull_with_options (self, remote_name, options,
progress, cancellable, error);
if (!ostree_repo_pull_with_options (self, remote_name, options,
progress, cancellable, error))
return FALSE;
if (old_commit &&
(flatpak_flags & FLATPAK_PULL_FLAGS_ALLOW_DOWNGRADE) == 0)
@ -1866,7 +1866,7 @@ repo_pull_one_dir (OstreeRepo *self,
return flatpak_fail (error, "Update is older then current version");
}
return res;
return TRUE;
}
static void