[gnome-software/gnome-3-20] Fix the upgrade state transitions to actually work

[Richard Hughes <rhughes src gnome org>]

commit 5abb4b2add19bf7cb6a8e8a665a37d004717609a
Author: Richard Hughes <richard hughsie com>
Date:   Tue Apr 12 18:42:52 2016 +0100

    Fix the upgrade state transitions to actually work

 src/gs-app.c           |    1 +
 src/gs-plugin-loader.c |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/src/gs-app.c b/src/gs-app.c
index eafd57f..104215a 100644
--- a/src/gs-app.c
+++ b/src/gs-app.c
@@ -482,6 +482,7 @@ gs_app_set_state_internal (GsApp *app, AsAppState state)
                /* installing has to go into an stable state */
                if (state == AS_APP_STATE_UNKNOWN ||
                    state == AS_APP_STATE_INSTALLED ||
+                   state == AS_APP_STATE_UPDATABLE ||
                    state == AS_APP_STATE_AVAILABLE)
                        state_change_ok = TRUE;
                break;
diff --git a/src/gs-plugin-loader.c b/src/gs-plugin-loader.c
index 52e90f1..f8d03f7 100644
--- a/src/gs-plugin-loader.c
+++ b/src/gs-plugin-loader.c
@@ -2749,8 +2749,8 @@ gs_plugin_loader_app_action_async (GsPluginLoader *plugin_loader,
                break;
        case GS_PLUGIN_LOADER_ACTION_UPGRADE_DOWNLOAD:
                state->function_name = "gs_plugin_app_upgrade_download";
-               state->state_success = AS_APP_STATE_AVAILABLE;
-               state->state_failure = AS_APP_STATE_UPDATABLE;
+               state->state_success = AS_APP_STATE_UPDATABLE;
+               state->state_failure = AS_APP_STATE_AVAILABLE;
                break;
        case GS_PLUGIN_LOADER_ACTION_UPGRADE_TRIGGER:
                state->function_name = "gs_plugin_app_upgrade_trigger";