diff options
| author | Phaedrus Leeds <mwleeds@protonmail.com> | 2022-07-01 15:01:48 -0700 |
|---|---|---|
| committer | Patrick <tingping@tingping.se> | 2022-07-18 18:51:07 -0500 |
| commit | bf93e004e9fc2f29eca2b655ed38efb2acff17d9 (patch) | |
| tree | f5dacd91c61536f49a3d6357094b803aa5f3f74a /app | |
| parent | f4b038c8b1f1e50a33c39e07a84f6e3ac383097a (diff) | |
| download | flatpak-bf93e004e9fc2f29eca2b655ed38efb2acff17d9.tar.gz | |
app: Fix inefficiency in pin and mask commands
There's no point reading data from disk on a code path that doesn't do
anything with it.
Diffstat (limited to 'app')
| -rw-r--r-- | app/flatpak-builtins-mask.c | 7 | ||||
| -rw-r--r-- | app/flatpak-builtins-pin.c | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/app/flatpak-builtins-mask.c b/app/flatpak-builtins-mask.c index 9f3f56bf..c39026f1 100644 --- a/app/flatpak-builtins-mask.c +++ b/app/flatpak-builtins-mask.c @@ -49,7 +49,6 @@ flatpak_builtin_mask (int argc, char **argv, GCancellable *cancellable, GError * g_autoptr(GOptionContext) context = NULL; g_autoptr(GPtrArray) dirs = NULL; FlatpakDir *dir; - g_autoptr(GPtrArray) patterns = NULL; int i; context = g_option_context_new (_("[PATTERN…] - disable updates and automatic installation matching patterns")); @@ -62,10 +61,12 @@ flatpak_builtin_mask (int argc, char **argv, GCancellable *cancellable, GError * dir = g_ptr_array_index (dirs, 0); - patterns = flatpak_dir_get_config_patterns (dir, "masked"); - if (argc == 1) { + g_autoptr(GPtrArray) patterns = NULL; + + patterns = flatpak_dir_get_config_patterns (dir, "masked"); + if (patterns->len == 0) { if (flatpak_fancy_output ()) diff --git a/app/flatpak-builtins-pin.c b/app/flatpak-builtins-pin.c index 4a84da38..462ad22a 100644 --- a/app/flatpak-builtins-pin.c +++ b/app/flatpak-builtins-pin.c @@ -51,7 +51,6 @@ flatpak_builtin_pin (int argc, char **argv, GCancellable *cancellable, GError ** g_autoptr(GOptionContext) context = NULL; g_autoptr(GPtrArray) dirs = NULL; FlatpakDir *dir; - g_autoptr(GPtrArray) patterns = NULL; int i; context = g_option_context_new (_("[PATTERN…] - disable automatic removal of runtimes matching patterns")); @@ -64,10 +63,12 @@ flatpak_builtin_pin (int argc, char **argv, GCancellable *cancellable, GError ** dir = g_ptr_array_index (dirs, 0); - patterns = flatpak_dir_get_config_patterns (dir, "pinned"); - if (argc == 1) { + g_autoptr(GPtrArray) patterns = NULL; + + patterns = flatpak_dir_get_config_patterns (dir, "pinned"); + if (patterns->len == 0) { if (flatpak_fancy_output ()) |