[gnome-software/wip/iainl/ubuntu-xenial] trivial: Don't do two update actions for live update



commit 78462ae8b49315cc08a262d9102382fcf1966268
Author: Richard Hughes <richard hughsie com>
Date:   Mon Apr 11 10:31:12 2016 +0100

    trivial: Don't do two update actions for live update

 src/gs-plugin-loader.c |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)
---
diff --git a/src/gs-plugin-loader.c b/src/gs-plugin-loader.c
index b3d54ae..292fba8 100644
--- a/src/gs-plugin-loader.c
+++ b/src/gs-plugin-loader.c
@@ -2672,6 +2672,7 @@ gs_plugin_loader_app_action_async (GsPluginLoader *plugin_loader,
                gs_plugin_loader_update_async (plugin_loader, list,
                                               cancellable, callback,
                                               user_data);
+               return;
        }
 
        if (action == GS_PLUGIN_LOADER_ACTION_REMOVE) {
@@ -2710,11 +2711,6 @@ gs_plugin_loader_app_action_async (GsPluginLoader *plugin_loader,
                state->state_success = AS_APP_STATE_UNKNOWN;
                state->state_failure = AS_APP_STATE_UNKNOWN;
                break;
-       case GS_PLUGIN_LOADER_ACTION_UPDATE:
-               state->function_name = "gs_plugin_update_app";
-               state->state_success = AS_APP_STATE_INSTALLED;
-               state->state_failure = AS_APP_STATE_UPDATABLE_LIVE;
-               break;
        case GS_PLUGIN_LOADER_ACTION_UPGRADE_DOWNLOAD:
                state->function_name = "gs_plugin_app_upgrade_download";
                state->state_success = AS_APP_STATE_AVAILABLE;


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