From 8bfa23d70a7b379f5bb1bae2925796970f55aa55 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@collabora.com>
Date: Thu, 1 Aug 2019 14:58:50 +0100
Subject: [PATCH] wrap: Produce more debug output when running helper commands

Signed-off-by: Simon McVittie <smcv@collabora.com>
---
 src/wrap.c | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/src/wrap.c b/src/wrap.c
index d26ab979e..c21c86cb3 100644
--- a/src/wrap.c
+++ b/src/wrap.c
@@ -737,6 +737,17 @@ capture_output (const char * const * argv,
   gint exit_status;
   g_autofree gchar *output = NULL;
   g_autofree gchar *errors = NULL;
+  gsize i;
+  g_autoptr(GString) command = g_string_new ("");
+
+  for (i = 0; argv[i] != NULL; i++)
+    {
+      g_autofree gchar *quoted = g_shell_quote (argv[i]);
+
+      g_string_append_printf (command, " %s", quoted);
+    }
+
+  g_debug ("run:%s", command->str);
 
   if (!g_spawn_sync (NULL,  /* cwd */
                      (char **) argv,
@@ -760,6 +771,8 @@ capture_output (const char * const * argv,
   if (len > 0 && output[len - 1] == '\n')
     output[len - 1] = '\0';
 
+  g_debug ("-> %s", output);
+
   return g_steal_pointer (&output);
 }
 
@@ -770,6 +783,22 @@ run_bwrap (FlatpakBwrap *bwrap,
   gint exit_status;
   g_autofree gchar *output = NULL;
   g_autofree gchar *errors = NULL;
+  guint i;
+  g_autoptr(GString) command = g_string_new ("");
+
+  for (i = 0; i < bwrap->argv->len; i++)
+    {
+      g_autofree gchar *quoted = NULL;
+      char *unquoted = g_ptr_array_index (bwrap->argv, i);
+
+      if (unquoted == NULL)
+        break;
+
+      quoted = g_shell_quote (unquoted);
+      g_string_append_printf (command, " %s", quoted);
+    }
+
+  g_debug ("run:%s", command->str);
 
   if (!g_spawn_sync (NULL,  /* cwd */
                      (char **) bwrap->argv->pdata,
-- 
GitLab