[gnome-builder] flatpak: log various flatpak subprocesses to stderr



commit 48a8883695a9a86e3578efaf0881ad94bbf95db2
Author: Christian Hergert <chergert redhat com>
Date:   Mon Dec 12 17:01:57 2016 -0800

    flatpak: log various flatpak subprocesses to stderr
    
    This injects some information on the installation process of flatpak
    runtimes to the build log.

 plugins/flatpak/gbp-flatpak-runtime.c |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)
---
diff --git a/plugins/flatpak/gbp-flatpak-runtime.c b/plugins/flatpak/gbp-flatpak-runtime.c
index 76fd85d..ea62cda 100644
--- a/plugins/flatpak/gbp-flatpak-runtime.c
+++ b/plugins/flatpak/gbp-flatpak-runtime.c
@@ -275,8 +275,14 @@ gbp_flatpak_runtime_prebuild_worker (GTask        *task,
               ide_subprocess_launcher_push_argv (launcher2, "--from");
               ide_subprocess_launcher_push_argv (launcher2, gnome_repo_name);
               ide_subprocess_launcher_push_argv (launcher2, gnome_repo_path);
+              ide_build_result_log_stderr (build_result,
+                                           "Adding missing flatpak repository %s from %s\n",
+                                           gnome_repo_name, gnome_repo_path);
               process2 = ide_subprocess_launcher_spawn (launcher2, cancellable, &error);
 
+              if (process2 != NULL)
+                ide_build_result_log_subprocess (build_result, process2);
+
               if (process2 == NULL || !ide_subprocess_wait_check (process2, cancellable, &error))
                 {
                   g_task_return_error (task, g_steal_pointer (&error));
@@ -303,8 +309,14 @@ gbp_flatpak_runtime_prebuild_worker (GTask        *task,
               ide_subprocess_launcher_push_argv (launcher3, gnome_repo_name);
               ide_subprocess_launcher_push_argv (launcher3, self->platform);
               ide_subprocess_launcher_push_argv (launcher3, self->branch);
+              ide_build_result_log_stderr (build_result,
+                                           "Installing missing flatpak runtime %s (%s)\n",
+                                           self->platform, self->branch);
               process3 = ide_subprocess_launcher_spawn (launcher3, cancellable, &error);
 
+              if (process3 != NULL)
+                ide_build_result_log_subprocess (build_result, process3);
+
               if (process3 == NULL || !ide_subprocess_wait_check (process3, cancellable, &error))
                 {
                   g_task_return_error (task, g_steal_pointer (&error));
@@ -331,8 +343,14 @@ gbp_flatpak_runtime_prebuild_worker (GTask        *task,
               ide_subprocess_launcher_push_argv (launcher4, gnome_repo_name);
               ide_subprocess_launcher_push_argv (launcher4, self->sdk);
               ide_subprocess_launcher_push_argv (launcher4, self->branch);
+              ide_build_result_log_stderr (build_result,
+                                           "Installing missing flatpak SDK %s (%s)\n",
+                                           self->sdk, self->branch);
               process4 = ide_subprocess_launcher_spawn (launcher4, cancellable, &error);
 
+              if (process4 != NULL)
+                ide_build_result_log_subprocess (build_result, process4);
+
               if (process4 == NULL || !ide_subprocess_wait_check (process4, cancellable, &error))
                 {
                   g_task_return_error (task, g_steal_pointer (&error));


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