marko10_000
/
flatpak-builder
forked from Mirrors/flatpak-builder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

install: Better check for pre-existing installation 

We need an actual active installation, not just the base directory.

This caused a failure if the user had tried to install and app but the
installation failed. After that installation failed due to it claiming
to be installed, while uninstall failed due it it *not* being
installed.
tingping/wmclass
Alexander Larsson 2016-05-30 16:35:50 +02:00
parent 8533f06dc0
commit bd7cf1af93
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/flatpak-builtins-install.c
View File

@ -205,7 +205,8 @@ flatpak_builtin_install (int argc, char **argv, GCancellable *cancellable, GErro
const char *branch = NULL;
g_autofree char *ref = NULL;
gboolean is_app;
g_autoptr(GFile) deploy_base = NULL;
g_autoptr(GFile) deploy_dir = NULL;
g_autoptr(GVariant) deploy_data = NULL;
context = g_option_context_new ("REPOSITORY NAME [BRANCH] - Install an application or runtime");
@ -231,8 +232,8 @@ flatpak_builtin_install (int argc, char **argv, GCancellable *cancellable, GErro
if (ref == NULL)
return FALSE;
deploy_base = flatpak_dir_get_deploy_dir (dir, ref);
if (g_file_query_exists (deploy_base, NULL))
deploy_dir = flatpak_dir_get_if_deployed (dir, ref, NULL, cancellable);
if (deploy_dir != NULL)
{
g_auto(GStrv) parts = flatpak_decompose_ref (ref, error);

23
common/flatpak-dir.c
View File

@ -2770,6 +2770,7 @@ flatpak_dir_deploy_install (FlatpakDir *self,
{
g_auto(GLnxLockFile) lock = GLNX_LOCK_FILE_INIT;
g_autoptr(GFile) deploy_base = NULL;
g_autoptr(GFile) old_deploy_dir = NULL;
gboolean created_deploy_base = FALSE;
gboolean ret = FALSE;
g_autoptr(GError) local_error = NULL;
@ -2779,22 +2780,24 @@ flatpak_dir_deploy_install (FlatpakDir *self,
cancellable, error))
goto out;
old_deploy_dir = flatpak_dir_get_if_deployed (self, ref, NULL, cancellable);
if (old_deploy_dir != NULL)
{
g_set_error (error, FLATPAK_ERROR,
FLATPAK_ERROR_ALREADY_INSTALLED,
"%s branch %s already installed",
ref_parts[1], ref_parts[3]);
goto out;
}
deploy_base = flatpak_dir_get_deploy_dir (self, ref);
if (!g_file_make_directory_with_parents (deploy_base, cancellable, &local_error))
{
if (g_error_matches (local_error, G_IO_ERROR, G_IO_ERROR_EXISTS))
{
g_set_error (error,
G_IO_ERROR, G_IO_ERROR_EXISTS,
"%s branch %s already installed",
ref_parts[1], ref_parts[3]);
}
else
if (!g_error_matches (local_error, G_IO_ERROR, G_IO_ERROR_EXISTS))
{
g_propagate_error (error, g_steal_pointer (&local_error));
goto out;
}
goto out;
}
/* After we create the deploy base we must goto out on errors */