[gnome-software] trivial: add ERROR_PLUGIN_DEPSOLVE_FAILED
- From: Richard Hughes <rhughes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-software] trivial: add ERROR_PLUGIN_DEPSOLVE_FAILED
- Date: Wed, 7 Sep 2016 15:30:29 +0000 (UTC)
commit 66e6232cb2a7e7abc8b22e20c8e3c66b5662c1eb
Author: Richard Hughes <richard hughsie com>
Date: Wed Sep 7 14:53:09 2016 +0100
trivial: add ERROR_PLUGIN_DEPSOLVE_FAILED
src/gs-plugin-loader.c | 4 ++--
src/gs-plugin.c | 2 ++
src/gs-plugin.h | 2 ++
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/src/gs-plugin-loader.c b/src/gs-plugin-loader.c
index 83a9fb3..3584d59 100644
--- a/src/gs-plugin-loader.c
+++ b/src/gs-plugin-loader.c
@@ -3697,7 +3697,7 @@ gs_plugin_loader_setup (GsPluginLoader *plugin_loader,
if (dep_loop_check++ > 100) {
g_set_error (error,
GS_PLUGIN_ERROR,
- GS_PLUGIN_ERROR_FAILED,
+ GS_PLUGIN_ERROR_PLUGIN_DEPSOLVE_FAILED,
"got stuck in dep loop");
return FALSE;
}
@@ -3765,7 +3765,7 @@ gs_plugin_loader_setup (GsPluginLoader *plugin_loader,
if (dep_loop_check++ > 100) {
g_set_error (error,
GS_PLUGIN_ERROR,
- GS_PLUGIN_ERROR_FAILED,
+ GS_PLUGIN_ERROR_PLUGIN_DEPSOLVE_FAILED,
"got stuck in priority loop");
return FALSE;
}
diff --git a/src/gs-plugin.c b/src/gs-plugin.c
index 04e75db..7fb0f60 100644
--- a/src/gs-plugin.c
+++ b/src/gs-plugin.c
@@ -1301,6 +1301,8 @@ gs_plugin_error_to_string (GsPluginError error)
return "account-suspended";
if (error == GS_PLUGIN_ERROR_ACCOUNT_DEACTIVATED)
return "account-deactivated";
+ if (error == GS_PLUGIN_ERROR_PLUGIN_DEPSOLVE_FAILED)
+ return "plugin-depsolve-failed";
return NULL;
}
diff --git a/src/gs-plugin.h b/src/gs-plugin.h
index 7c34db9..99f9160 100644
--- a/src/gs-plugin.h
+++ b/src/gs-plugin.h
@@ -110,6 +110,7 @@ typedef guint64 GsPluginFlags;
* @GS_PLUGIN_ERROR_PIN_REQUIRED: PIN required for authentication
* @GS_PLUGIN_ERROR_ACCOUNT_SUSPENDED: User account has been suspended
* @GS_PLUGIN_ERROR_ACCOUNT_DEACTIVATED: User account has been deactivated
+ * @GS_PLUGIN_ERROR_PLUGIN_DEPSOLVE_FAILED: The plugins installed are incompatible
*
* The failure error types.
**/
@@ -125,6 +126,7 @@ typedef enum {
GS_PLUGIN_ERROR_PIN_REQUIRED,
GS_PLUGIN_ERROR_ACCOUNT_SUSPENDED,
GS_PLUGIN_ERROR_ACCOUNT_DEACTIVATED,
+ GS_PLUGIN_ERROR_PLUGIN_DEPSOLVE_FAILED,
/*< private >*/
GS_PLUGIN_ERROR_LAST
} GsPluginError;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]