diff options
| author | Phaedrus Leeds <mwleeds@protonmail.com> | 2022-07-24 16:12:10 -0500 |
|---|---|---|
| committer | Phaedrus Leeds <mwl458@gmail.com> | 2022-07-25 16:58:16 -0400 |
| commit | 6db7806762f6e277a81b02010a3bde237d42b64b (patch) | |
| tree | 3c357d6a241e5358c2119f3c0141ee421e9c2da6 | |
| parent | 04d2d1cd3da200950895477c0b9f5379f9755a0f (diff) | |
| download | flatpak-6db7806762f6e277a81b02010a3bde237d42b64b.tar.gz | |
build-export: Fully ignore stdout content of icon validation
The docs for g_spawn_sync() say:
"Note that you must set the G_SPAWN_STDOUT_TO_DEV_NULL and
G_SPAWN_STDERR_TO_DEV_NULL flags when passing NULL for standard_output
and standard_error."
So add in the stdout flag when calling flatpak-validate-icon in the
build-export command. Without this, there's output in the test logs
from when they're building the test app, due to
https://github.com/flatpak/flatpak/pull/4803
| -rw-r--r-- | app/flatpak-builtins-build-export.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/flatpak-builtins-build-export.c b/app/flatpak-builtins-build-export.c index 936f6ad5..2b7fadfd 100644 --- a/app/flatpak-builtins-build-export.c +++ b/app/flatpak-builtins-build-export.c @@ -391,7 +391,9 @@ validate_icon_file (GFile *file, GError **error) g_ptr_array_add (args, NULL); - if (!g_spawn_sync (NULL, (char **) args->pdata, NULL, 0, NULL, NULL, NULL, &err, &status, error)) + if (!g_spawn_sync (NULL, (char **) args->pdata, NULL, + G_SPAWN_STDOUT_TO_DEV_NULL, + NULL, NULL, NULL, &err, &status, error)) { g_debug ("Icon validation: %s", (*error)->message); return FALSE; |