From 1e7bd752bf1b44d9792d1d460589c40a6d7b68a2 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 4 Aug 2016 18:41:01 -0400 Subject: [PATCH] Don't handle already-installed error too early Leave this to the callers which may well print out a different message depending on whether the update did anything or not. --- common/flatpak-dir.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c index 53608d64d..5dc4025b5 100644 --- a/common/flatpak-dir.c +++ b/common/flatpak-dir.c @@ -2928,15 +2928,8 @@ flatpak_dir_deploy_update (FlatpakDir *self, checksum_or_latest, opt_subpaths ? opt_subpaths : old_subpaths, old_deploy_data, - cancellable, &my_error)) - { - if (g_error_matches (my_error, FLATPAK_ERROR, - FLATPAK_ERROR_ALREADY_INSTALLED)) - return TRUE; - - g_propagate_error (error, my_error); - return FALSE; - } + cancellable, error)) + return FALSE; if (!flatpak_dir_undeploy (self, ref, old_active, FALSE,