From 3694d5f2630ee5edf02ffdf25b37b9aca2a9aa3c Mon Sep 17 00:00:00 2001 From: guinux Date: Tue, 17 Feb 2015 13:52:14 +0100 Subject: [PATCH 1/3] prevent from AUR errors --- src/daemon.vala | 1 - 1 file changed, 1 deletion(-) diff --git a/src/daemon.vala b/src/daemon.vala index 5945af4..37ed284 100644 --- a/src/daemon.vala +++ b/src/daemon.vala @@ -240,7 +240,6 @@ namespace Pamac { if (emit_signal) { emit_refreshed (err); } - print("done\n"); databases_lock_mutex.unlock (); return success; }); From c0d8266d7a9123e06d863dcfe3ead7cea80e57f4 Mon Sep 17 00:00:00 2001 From: guinux Date: Wed, 18 Feb 2015 10:19:26 +0100 Subject: [PATCH 2/3] push to right file --- src/aur.vala | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/src/aur.vala b/src/aur.vala index 285efe6..6f4d85c 100644 --- a/src/aur.vala +++ b/src/aur.vala @@ -1,7 +1,7 @@ /* * pamac-vala * - * Copyright (C) 2014 Guillaume Benoit + * Copyright (C) 2014-2015 Guillaume Benoit * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -41,11 +41,16 @@ namespace AUR { } unowned Json.Node? root = parser.get_root (); if (root != null) { - prev_inter = root.get_object ().get_array_member ("results"); + if (root.get_object ().get_string_member ("type") == "error") { + stderr.printf ("Failed to search %s from AUR\n", needles[0]); + } else { + prev_inter = root.get_object ().get_array_member ("results"); + } } int length = needles.length; - if (length == 1) + if (length == 1) { return prev_inter; + } int i = 1; var inter = new Json.Array (); var found = new Json.Array (); @@ -61,7 +66,11 @@ namespace AUR { } root = parser.get_root (); if (root != null) { - found = root.get_object ().get_array_member ("results"); + if (root.get_object ().get_string_member ("type") == "error") { + stderr.printf ("Failed to search %s from AUR\n", needles[i]); + } else { + found = root.get_object ().get_array_member ("results"); + } } foreach (var prev_inter_node in prev_inter.get_elements ()) { foreach (var found_node in found.get_elements ()) { @@ -94,7 +103,11 @@ namespace AUR { } unowned Json.Node? root = parser.get_root (); if (root != null) { - pkg_info = root.get_object ().get_object_member ("results"); + if (root.get_object ().get_string_member ("type") == "error") { + stderr.printf ("Failed to get infos about %s from AUR\n", pkgname); + } else { + pkg_info = root.get_object ().get_object_member ("results"); + } } return pkg_info; } @@ -119,7 +132,11 @@ namespace AUR { } unowned Json.Node? root = parser.get_root (); if (root != null) { - results = root.get_object ().get_array_member ("results"); + if (root.get_object ().get_string_member ("type") == "error") { + stderr.printf ("Failed to multiinfo %s from AUR\n", builder.str); + } else { + results = root.get_object ().get_array_member ("results"); + } } return results; } From d677f5408f24bce64d6c9b12936610072896788d Mon Sep 17 00:00:00 2001 From: Philip Date: Wed, 18 Feb 2015 19:01:16 +0100 Subject: [PATCH 3/3] prepare 2.1.2 --- src/manager_window.vala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/manager_window.vala b/src/manager_window.vala index 476fc81..d1a2611 100644 --- a/src/manager_window.vala +++ b/src/manager_window.vala @@ -20,7 +20,7 @@ using Gtk; using Alpm; -const string VERSION = "2.1.1"; +const string VERSION = "2.1.2"; namespace Pamac {