From 8839ff08b1512860d0ab908fb8c84487fad67fd6 Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl@redhat.com>
Date: Wed, 6 Feb 2019 10:01:14 +0100
Subject: [PATCH] Fixup error messages

We were printing argv[3] which is wrong (and typically null).
Instead set the error message where it happens and we know
what we were trying to do.

Closes: #269
Approved by: alexlarsson
---
 src/builder-main.c     | 4 ++--
 src/builder-manifest.c | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/builder-main.c b/src/builder-main.c
index 396c5768..1d10ba97 100644
--- a/src/builder-main.c
+++ b/src/builder-main.c
@@ -724,7 +724,7 @@ main (int    argc,
     {
       if (!builder_manifest_show_deps (manifest, build_context, &error))
         {
-          g_printerr ("Error running %s: %s\n", argv[3], error->message);
+          g_printerr ("Error calculating deps: %s\n", error->message);
           return 1;
         }
 
@@ -736,7 +736,7 @@ main (int    argc,
       if (!builder_manifest_install_deps (manifest, build_context, opt_install_deps_from, opt_user, opt_installation,
                                           opt_yes, &error))
         {
-          g_printerr ("Error running %s: %s\n", argv[3], error->message);
+          g_printerr ("Error installing deps: %s\n", error->message);
           return 1;
         }
       if (opt_install_deps_only)
diff --git a/src/builder-manifest.c b/src/builder-manifest.c
index 4e45a30e..ff754739 100644
--- a/src/builder-manifest.c
+++ b/src/builder-manifest.c
@@ -3701,7 +3701,11 @@ builder_manifest_install_dep (BuilderManifest *self,
   g_ptr_array_add (args, NULL);
 
   if (!builder_maybe_host_spawnv (NULL, NULL, 0, error, (const char * const *)args->pdata))
-    return FALSE;
+    {
+      g_autofree char *commandline = flatpak_quote_argv ((const char **)args->pdata);
+      g_prefix_error (error, "running `%s`: ", commandline);
+      return FALSE;
+    }
 
   return TRUE;
 }