diff options
| author | Renato Botelho <renato@netgate.com> | 2017-04-19 08:25:49 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2017-04-19 08:32:32 -0300 |
| commit | 188f8aee6c9c3e009a53b3bea7ff208712714d77 (patch) | |
| tree | fcd7b4341f2bd065667b7647e0aee82e02169237 | |
| parent | 8c96e513cc48144390f612b5c63bf1b842a25616 (diff) | |
| download | pfsense-188f8aee6c9c3e009a53b3bea7ff208712714d77.zip pfsense-188f8aee6c9c3e009a53b3bea7ff208712714d77.tar.gz | |
Use correct function (is_pkg_installed) and unbreak get_pkg_info()
| -rw-r--r-- | src/etc/inc/pkg-utils.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/etc/inc/pkg-utils.inc b/src/etc/inc/pkg-utils.inc index 068f1ba..1786304 100644 --- a/src/etc/inc/pkg-utils.inc +++ b/src/etc/inc/pkg-utils.inc @@ -412,7 +412,7 @@ function get_pkg_info($pkgs = 'all', $remote_repo_usage_disabled = false, $insta if (!$installed_pkgs_only) { $rc = pkg_exec("search {$extra_param}-R --raw-format json-compact " . $pkgs, $out, $err); } - if (($installed_pkgs_only || ($rc != 0 && $remote_repo_usage_disabled)) && is_package_installed($pkgs)) { + if (($installed_pkgs_only || ($rc != 0 && $remote_repo_usage_disabled)) && is_pkg_installed($pkgs)) { /* Fall back on pkg info to return locally installed matching pkgs instead, if * * (1) only installed pkgs needed, or @@ -429,7 +429,7 @@ function get_pkg_info($pkgs = 'all', $remote_repo_usage_disabled = false, $insta * * We skip this step if no matching pkgs are installed, because then pkg info would return a "no matching pkgs" * RC code, even though this wouldn't be considered an "error" (and $out+$err would be correct empty strings if none match). - * Note that is_package_installed() is a wrapper for pkg info -e <pattern> which is what we need here. + * Note that is_pkg_installed() is a wrapper for pkg info -e <pattern> which is what we need here. */ // ok, 1 or more packages match, so pkg info can be safely called to get the pkg list |
