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

lib: Use the new installed/not-installed custom GErrors

tingping/wmclass
Alexander Larsson 2015-12-15 15:33:23 +01:00
parent 856c8210a9
commit 8f700b9aca
1 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/xdg-app-installation.c
View File

@ -27,6 +27,7 @@
#include "xdg-app-remote-private.h"
#include "xdg-app-enum-types.h"
#include "xdg-app-dir.h"
#include "xdg-app-error.h"
typedef struct _XdgAppInstallationPrivate XdgAppInstallationPrivate;
@ -490,7 +491,9 @@ xdg_app_installation_install (XdgAppInstallation *self,
deploy_base = xdg_app_dir_get_deploy_dir (priv->dir, ref);
if (g_file_query_exists (deploy_base, cancellable))
{
xdg_app_fail (error, "%s branch %s already installed", name, version);
g_set_error (error,
XDG_APP_ERROR, XDG_APP_ERROR_ALREADY_INSTALLED,
"%s branch %s already installed", name, version ? version : "master");
goto out;
}
@ -569,6 +572,7 @@ xdg_app_installation_update (XdgAppInstallation *self,
{
XdgAppInstallationPrivate *priv = xdg_app_installation_get_instance_private (self);
g_autofree char *ref = NULL;
g_autoptr(GFile) deploy_base = NULL;
g_autoptr(XdgAppDir) dir_clone = NULL;
g_autoptr(GMainContext) main_context = NULL;
g_autoptr(OstreeAsyncProgress) ostree_progress = NULL;
@ -580,6 +584,15 @@ xdg_app_installation_update (XdgAppInstallation *self,
if (ref == NULL)
return NULL;
deploy_base = xdg_app_dir_get_deploy_dir (priv->dir, ref);
if (!g_file_query_exists (deploy_base, cancellable))
{
g_set_error (error,
XDG_APP_ERROR, XDG_APP_ERROR_NOT_INSTALLED,
"%s branch %s is not installed", name, version ? version : "master");
return NULL;
}
remote_name = xdg_app_dir_get_origin (priv->dir, ref, cancellable, error);
if (remote_name == NULL)
return NULL;
@ -654,6 +667,7 @@ xdg_app_installation_uninstall (XdgAppInstallation *self,
g_autofree char *ref = NULL;
g_autofree char *remote_name = NULL;
g_autofree char *current_ref = NULL;
g_autoptr(GFile) deploy_base = NULL;
g_autoptr(XdgAppDir) dir_clone = NULL;
gboolean was_deployed = FALSE;
@ -661,6 +675,15 @@ xdg_app_installation_uninstall (XdgAppInstallation *self,
if (ref == NULL)
return FALSE;
deploy_base = xdg_app_dir_get_deploy_dir (priv->dir, ref);
if (!g_file_query_exists (deploy_base, cancellable))
{
g_set_error (error,
XDG_APP_ERROR, XDG_APP_ERROR_NOT_INSTALLED,
"%s branch %s is not installed", name, version ? version : "master");
return NULL;
}
remote_name = xdg_app_dir_get_origin (priv->dir, ref, cancellable, error);
if (remote_name == NULL)
return FALSE;