summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2014-12-05 14:59:34 +0100
committerThomas Haller <thaller@redhat.com>2014-12-05 15:01:01 +0100
commit820e41645f7173e544b31c5178fae5b40491c6a1 (patch)
tree171470946cb484a3a7665a5efebfd4c91d668489
parent490eb51f0a88a10abecd4f180f9bc9bed72163e1 (diff)
downloadNetworkManager-820e41645f7173e544b31c5178fae5b40491c6a1.tar.gz
libnm: fix wrong g_return_if_fail() in nm_utils_file_search_in_paths()
Fixes: 6399170ff36986b7e973f77598390b37612106cb https://bugzilla.gnome.org/show_bug.cgi?id=740783
-rw-r--r--libnm-core/nm-utils.c2
-rw-r--r--libnm-util/nm-utils.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c
index 7b78925879..f104925c37 100644
--- a/libnm-core/nm-utils.c
+++ b/libnm-core/nm-utils.c
@@ -2232,7 +2232,7 @@ nm_utils_file_search_in_paths (const char *progname,
g_return_val_if_fail (!error || !*error, NULL);
g_return_val_if_fail (progname && progname[0] && !strchr (progname, '/'), NULL);
- g_return_val_if_fail (!file_test_flags || predicate, NULL);
+ g_return_val_if_fail (file_test_flags || predicate, NULL);
/* Only consider @try_first if it is a valid, absolute path. This makes
* it simpler to pass in a path from configure checks. */
diff --git a/libnm-util/nm-utils.c b/libnm-util/nm-utils.c
index be3cb6342c..b5bbfbd349 100644
--- a/libnm-util/nm-utils.c
+++ b/libnm-util/nm-utils.c
@@ -1772,7 +1772,7 @@ nm_utils_file_search_in_paths (const char *progname,
g_return_val_if_fail (!error || !*error, NULL);
g_return_val_if_fail (progname && progname[0] && !strchr (progname, '/'), NULL);
- g_return_val_if_fail (!file_test_flags || predicate, NULL);
+ g_return_val_if_fail (file_test_flags || predicate, NULL);
/* Only consider @try_first if it is a valid, absolute path. This makes
* it simpler to pass in a path from configure checks. */