[gnome-builder/gnome-builder-41] flatpak: fix verbosity check



commit fd43c3f1348893a05583046c8889f8845f80d516
Author: Christian Hergert <chergert redhat com>
Date:   Thu Nov 18 21:08:21 2021 -0800

    flatpak: fix verbosity check

 src/plugins/flatpak/daemon/gnome-builder-flatpak.c | 2 +-
 src/plugins/flatpak/gbp-flatpak-client.c           | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/src/plugins/flatpak/daemon/gnome-builder-flatpak.c 
b/src/plugins/flatpak/daemon/gnome-builder-flatpak.c
index 65b2c1629..c21df5d02 100644
--- a/src/plugins/flatpak/daemon/gnome-builder-flatpak.c
+++ b/src/plugins/flatpak/daemon/gnome-builder-flatpak.c
@@ -140,7 +140,7 @@ log_func (const gchar    *log_domain,
   char *str;
   int fd;
 
-  if (!verbose && flags < G_LOG_LEVEL_MESSAGE)
+  if (!verbose && flags > G_LOG_LEVEL_MESSAGE)
     return;
 
   if (user_data)
diff --git a/src/plugins/flatpak/gbp-flatpak-client.c b/src/plugins/flatpak/gbp-flatpak-client.c
index d168919d3..e2adc4a3d 100644
--- a/src/plugins/flatpak/gbp-flatpak-client.c
+++ b/src/plugins/flatpak/gbp-flatpak-client.c
@@ -102,9 +102,6 @@ gbp_flatpak_client_reset (GbpFlatpakClient *self)
   ide_subprocess_launcher_set_cwd (launcher, g_get_home_dir ());
   ide_subprocess_launcher_set_clear_env (launcher, FALSE);
 
-  if (ide_log_get_verbosity () > 0)
-    ide_subprocess_launcher_setenv (launcher, "G_MESSAGES_DEBUG", "all", TRUE);
-
   if (g_getenv ("BUILDER_FLATPAK_DEBUG") != NULL)
     {
       ide_subprocess_launcher_setenv (launcher, "G_DEBUG", "fatal-criticals", TRUE);
@@ -122,6 +119,9 @@ gbp_flatpak_client_reset (GbpFlatpakClient *self)
   ide_subprocess_launcher_push_argv (launcher, "--read-fd=3");
   ide_subprocess_launcher_push_argv (launcher, "--write-fd=4");
 
+  if (ide_log_get_verbosity () > 0)
+    ide_subprocess_launcher_push_argv (launcher, "--verbose");
+
   g_set_object (&self->connection, service_connection);
 
   g_mutex_lock (&self->mutex);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]