diff options
| author | Matthew Leeds <matthew.leeds@endlessm.com> | 2018-07-09 19:27:34 +0200 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-07-09 23:02:16 +0000 |
| commit | e3ec1ec5374cee7748eaa0fe3e7711c074a13e2e (patch) | |
| tree | b52b58740766825fda9269465d3b03bcef154e54 | |
| parent | e4dbd107b3dc6915088d748ce72c405b61ccbbc0 (diff) | |
| download | flatpak-e3ec1ec5374cee7748eaa0fe3e7711c074a13e2e.tar.gz | |
dir: Use flatpak_dir_use_system_helper() more
Use the helper function to decide whether to use the system helper in
one more place.
Closes: #1874
Approved by: alexlarsson
| -rw-r--r-- | common/flatpak-dir.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c index 18a31a5e..ee62d55a 100644 --- a/common/flatpak-dir.c +++ b/common/flatpak-dir.c @@ -2089,17 +2089,13 @@ _flatpak_dir_ensure_repo (FlatpakDir *self, g_autoptr(GFile) repodir = NULL; g_autoptr(OstreeRepo) repo = NULL; g_autoptr(GError) my_error = NULL; - gboolean use_helper; if (self->repo != NULL) return TRUE; - use_helper = - !self->no_system_helper && !self->user && getuid () != 0; - if (!g_file_query_exists (self->basedir, cancellable)) { - if (use_helper) + if (flatpak_dir_use_system_helper (self, NULL)) { g_autoptr(GError) local_error = NULL; const char *installation = flatpak_dir_get_id (self); @@ -2131,7 +2127,7 @@ _flatpak_dir_ensure_repo (FlatpakDir *self, repodir = g_file_get_child (self->basedir, "repo"); - if (use_helper) + if (flatpak_dir_use_system_helper (self, NULL)) { g_autoptr(GFile) cache_dir = NULL; g_autofree char *cache_path = NULL; @@ -2190,7 +2186,7 @@ _flatpak_dir_ensure_repo (FlatpakDir *self, } /* Reset min-free-space-percent to 0, this keeps being a problem for a lot of people */ - if (!use_helper) + if (!flatpak_dir_use_system_helper (self, NULL)) { GKeyFile *orig_config = NULL; g_autofree char *orig_min_free_space_percent = NULL; |