From e3db7a4461463beadb9792d06327bf8f4fa33f6b Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl@redhat.com>
Date: Thu, 25 Apr 2019 11:07:20 +0200
Subject: [PATCH] cli: Make FLATPAK_ERROR_ABORTED return a failed exit code.

We now return a NULL error meaning nothing is printed as before
but a FALSE result which means the exist code marks the failure.

Closes: #2858
Approved by: alexlarsson
---
 app/flatpak-builtins-install.c       | 15 +++------------
 app/flatpak-builtins-remote-delete.c |  6 ++----
 app/flatpak-builtins-uninstall.c     |  5 +----
 app/flatpak-builtins-update.c        |  5 +----
 4 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/app/flatpak-builtins-install.c b/app/flatpak-builtins-install.c
index 5ee6464e..0d493275 100644
--- a/app/flatpak-builtins-install.c
+++ b/app/flatpak-builtins-install.c
@@ -169,10 +169,7 @@ install_bundle (FlatpakDir *dir,
   if (!flatpak_transaction_run (transaction, cancellable, error))
     {
       if (g_error_matches (*error, FLATPAK_ERROR, FLATPAK_ERROR_ABORTED))
-        {
-          g_clear_error (error);
-          return TRUE;
-        }
+        g_clear_error (error); /* Don't report on stderr */
 
       return FALSE;
     }
@@ -246,10 +243,7 @@ install_from (FlatpakDir *dir,
   if (!flatpak_transaction_run (transaction, cancellable, error))
     {
       if (g_error_matches (*error, FLATPAK_ERROR, FLATPAK_ERROR_ABORTED))
-        {
-          g_clear_error (error);
-          return TRUE;
-        }
+        g_clear_error (error); /* Don't report on stderr */
 
       return FALSE;
     }
@@ -521,10 +515,7 @@ flatpak_builtin_install (int argc, char **argv, GCancellable *cancellable, GErro
   if (!flatpak_transaction_run (transaction, cancellable, error))
     {
       if (g_error_matches (*error, FLATPAK_ERROR, FLATPAK_ERROR_ABORTED))
-        {
-          g_clear_error (error);
-          return TRUE;
-        }
+        g_clear_error (error); /* Don't report on stderr */
 
       return FALSE;
     }
diff --git a/app/flatpak-builtins-remote-delete.c b/app/flatpak-builtins-remote-delete.c
index 7a5752f0..6d860002 100644
--- a/app/flatpak-builtins-remote-delete.c
+++ b/app/flatpak-builtins-remote-delete.c
@@ -114,10 +114,8 @@ flatpak_builtin_remote_delete (int argc, char **argv, GCancellable *cancellable,
           if (!flatpak_transaction_run (transaction, cancellable, error))
             {
               if (g_error_matches (*error, FLATPAK_ERROR, FLATPAK_ERROR_ABORTED))
-                {
-                  g_clear_error (error);
-                  return TRUE;
-                }
+                g_clear_error (error);  /* Don't report on stderr */
+
               return FALSE;
             }
         }
diff --git a/app/flatpak-builtins-uninstall.c b/app/flatpak-builtins-uninstall.c
index f8f697c4..c95d2e4b 100644
--- a/app/flatpak-builtins-uninstall.c
+++ b/app/flatpak-builtins-uninstall.c
@@ -373,10 +373,7 @@ flatpak_builtin_uninstall (int argc, char **argv, GCancellable *cancellable, GEr
     if (!flatpak_transaction_run (transaction, cancellable, error))
       {
         if (g_error_matches (*error, FLATPAK_ERROR, FLATPAK_ERROR_ABORTED))
-          {
-            g_clear_error (error);
-            return TRUE;
-          }
+          g_clear_error (error); /* Don't report on stderr */
 
         return FALSE;
       }
diff --git a/app/flatpak-builtins-update.c b/app/flatpak-builtins-update.c
index 2844efb0..c7bcd7cd 100644
--- a/app/flatpak-builtins-update.c
+++ b/app/flatpak-builtins-update.c
@@ -277,10 +277,7 @@ flatpak_builtin_update (int           argc,
       if (!flatpak_transaction_run (transaction, cancellable, error))
         {
           if (g_error_matches (*error, FLATPAK_ERROR, FLATPAK_ERROR_ABORTED))
-            {
-              g_clear_error (error);
-              return TRUE;
-            }
+            g_clear_error (error);  /* Don't report on stderr */
 
           return FALSE;
         }