dir: Don't overzealously rewrite an error

It's an error to call g_set_error() on an error that's already set, and
flatpak_dir_get_deploy_data() already sets FLATPAK_ERROR_NOT_INSTALLED
for us when necessary, so just pass on any errors to the caller of
flatpak_dir_get_origin(). In the case that the error is something else,
that should be treated as an error, because we never expect the deploy
directory to exist but not have a deploy file (see the implementations
of flatpak_dir_deploy() and flatpak_dir_undeploy()).

Closes: #3032
Approved by: alexlarsson

1 files changed, 1 insertions, 5 deletions

diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c
index 8f9dc66c..cc3e9bf4 100644
--- a/common/flatpak-dir.c
+++ b/common/flatpak-dir.c
@@ -2627,11 +2627,7 @@ flatpak_dir_get_origin (FlatpakDir   *self,
   deploy_data = flatpak_dir_get_deploy_data (self, ref, FLATPAK_DEPLOY_VERSION_ANY,
                                              cancellable, error);
   if (deploy_data == NULL)
-    {
-      g_set_error (error, FLATPAK_ERROR, FLATPAK_ERROR_NOT_INSTALLED,
-                   _("%s not installed"), ref);
-      return NULL;
-    }
+    return NULL;
 
   return g_strdup (flatpak_deploy_data_get_origin (deploy_data));
 }