diff options
| author | Alexander Larsson <alexl@redhat.com> | 2016-05-17 11:54:44 +0200 |
|---|---|---|
| committer | Alexander Larsson <alexl@redhat.com> | 2016-05-17 11:54:44 +0200 |
| commit | 251dcdb680a623627fafa47e85c602814835c3d3 (patch) | |
| tree | 56c16c8b5d18a290c4f3a9174c445f4c49737f45 /common | |
| parent | 6b4e5dd9039b3ff8a6ea880b67524d2df9eab096 (diff) | |
| download | xdg-app-251dcdb680a623627fafa47e85c602814835c3d3.tar.gz | |
system-helper: Never use a system helper recursively
Diffstat (limited to 'common')
| -rw-r--r-- | common/flatpak-dir.c | 10 | ||||
| -rw-r--r-- | common/flatpak-dir.h | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c index 57986ea..017f4b7 100644 --- a/common/flatpak-dir.c +++ b/common/flatpak-dir.c @@ -62,6 +62,7 @@ struct FlatpakDir gboolean user; GFile *basedir; OstreeRepo *repo; + gboolean no_system_helper; FlatpakSystemHelper *system_helper; @@ -253,7 +254,7 @@ flatpak_dir_use_system_helper (FlatpakDir *self) { FlatpakSystemHelper *system_helper; - if (self->user || getuid () == 0) + if (self->no_system_helper || self->user || getuid () == 0) return FALSE; system_helper = flatpak_dir_get_system_helper (self); @@ -370,6 +371,13 @@ flatpak_dir_is_user (FlatpakDir *self) return self->user; } +void +flatpak_dir_set_no_system_helper (FlatpakDir *self, + gboolean no_system_helper) +{ + self->no_system_helper = no_system_helper; +} + GFile * flatpak_dir_get_path (FlatpakDir *self) { diff --git a/common/flatpak-dir.h b/common/flatpak-dir.h index 385139a..b4e1e3a 100644 --- a/common/flatpak-dir.h +++ b/common/flatpak-dir.h @@ -107,6 +107,8 @@ FlatpakDir *flatpak_dir_get (gboolean user); FlatpakDir *flatpak_dir_get_system (void); FlatpakDir *flatpak_dir_get_user (void); gboolean flatpak_dir_is_user (FlatpakDir *self); +void flatpak_dir_set_no_system_helper (FlatpakDir *self, + gboolean no_system_helper); GFile * flatpak_dir_get_path (FlatpakDir *self); GFile * flatpak_dir_get_changed_path (FlatpakDir *self); GFile * flatpak_dir_get_deploy_dir (FlatpakDir *self, |