[gnome-software/gnome-3-20] packagekit: Correctly detect a cancelled transaction

[Kalev Lember <klember src gnome org>]

commit 818381b76bb00be7b9213bacb351022362b768ef
Author: Richard Hughes <richard hughsie com>
Date:   Fri Jul 8 17:46:34 2016 +0100

    packagekit: Correctly detect a cancelled transaction
    
    In this case the results object is nonvalid and the PK error is set.

 src/plugins/gs-plugin-packagekit-refresh.c |    4 +---
 src/plugins/gs-plugin-packagekit.c         |    9 +++------
 2 files changed, 4 insertions(+), 9 deletions(-)
---
diff --git a/src/plugins/gs-plugin-packagekit-refresh.c b/src/plugins/gs-plugin-packagekit-refresh.c
index 9b1e99e..97d84d3 100644
--- a/src/plugins/gs-plugin-packagekit-refresh.c
+++ b/src/plugins/gs-plugin-packagekit-refresh.c
@@ -143,10 +143,8 @@ gs_plugin_refresh (GsPlugin *plugin,
                                                 cancellable,
                                                 gs_plugin_packagekit_progress_cb, &data,
                                                 error);
-               if (results == NULL) {
-                       gs_plugin_packagekit_convert_gerror (error);
+               if (!gs_plugin_packagekit_results_valid (results, error))
                        return FALSE;
-               }
        }
 
        /* download all the packages themselves */
diff --git a/src/plugins/gs-plugin-packagekit.c b/src/plugins/gs-plugin-packagekit.c
index 8fd1a30..a3efa40 100644
--- a/src/plugins/gs-plugin-packagekit.c
+++ b/src/plugins/gs-plugin-packagekit.c
@@ -360,8 +360,7 @@ gs_plugin_app_install (GsPlugin *plugin,
                                                         cancellable,
                                                         gs_plugin_packagekit_progress_cb, &data,
                                                         error);
-               if (results == NULL) {
-                       gs_plugin_packagekit_convert_gerror (error);
+               if (!gs_plugin_packagekit_results_valid (results, error)) {
                        gs_app_set_state_recover (app);
                        return FALSE;
                }
@@ -430,8 +429,7 @@ gs_plugin_app_install (GsPlugin *plugin,
                                                         cancellable,
                                                         gs_plugin_packagekit_progress_cb, &data,
                                                         error);
-               if (results == NULL) {
-                       gs_plugin_packagekit_convert_gerror (error);
+               if (!gs_plugin_packagekit_results_valid (results, error)) {
                        gs_app_set_state_recover (app);
                        return FALSE;
                }
@@ -456,8 +454,7 @@ gs_plugin_app_install (GsPlugin *plugin,
                                                      cancellable,
                                                      gs_plugin_packagekit_progress_cb, &data,
                                                      error);
-               if (results == NULL) {
-                       gs_plugin_packagekit_convert_gerror (error);
+               if (!gs_plugin_packagekit_results_valid (results, error)) {
                        gs_app_set_state_recover (app);
                        return FALSE;
                }