[gnome-software] trivial: Set the return value when gnome-software-cmd fails
- From: Richard Hughes <rhughes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-software] trivial: Set the return value when gnome-software-cmd fails
- Date: Mon, 28 Oct 2013 16:33:35 +0000 (UTC)
commit 6f9834c16fff2c597d9dacabcd2eff26e449f585
Author: Richard Hughes <richard hughsie com>
Date: Mon Oct 28 16:31:12 2013 +0000
trivial: Set the return value when gnome-software-cmd fails
src/gs-cmd.c | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
---
diff --git a/src/gs-cmd.c b/src/gs-cmd.c
index e6d7141..95fbad9 100644
--- a/src/gs-cmd.c
+++ b/src/gs-cmd.c
@@ -228,12 +228,16 @@ main (int argc, char **argv)
refine_flags,
NULL,
&error);
+ if (list == NULL)
+ ret = FALSE;
} else if (argc == 3 && g_strcmp0 (argv[1], "search") == 0) {
list = gs_plugin_loader_search (plugin_loader,
argv[2],
refine_flags,
NULL,
&error);
+ if (list == NULL)
+ ret = FALSE;
} else if (argc == 3 && g_strcmp0 (argv[1], "refine") == 0) {
app = gs_app_new (argv[2]);
ret = gs_plugin_loader_app_refine (plugin_loader,
@@ -246,6 +250,8 @@ main (int argc, char **argv)
refine_flags,
NULL,
&error);
+ if (list == NULL)
+ ret = FALSE;
} else if (argc == 2 && g_strcmp0 (argv[1], "popular") == 0) {
list = gs_plugin_loader_get_popular (plugin_loader,
refine_flags,
@@ -270,13 +276,19 @@ main (int argc, char **argv)
refine_flags,
NULL,
&error);
+ if (list == NULL)
+ ret = FALSE;
} else {
- g_warning ("Did not recognise option, use 'installed', "
- "'updates', 'popular', 'get-categories', "
- "'get-category-apps', or 'search'");
+ ret = FALSE;
+ g_set_error_literal (&error,
+ GS_PLUGIN_ERROR,
+ GS_PLUGIN_ERROR_FAILED,
+ "Did not recognise option, use 'installed', "
+ "'updates', 'popular', 'get-categories', "
+ "'get-category-apps', or 'search'");
}
- if (error != NULL) {
- g_warning ("Failed: %s", error->message);
+ if (!ret) {
+ g_print ("Failed: %s\n", error->message);
g_error_free (error);
goto out;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]