diff options
| author | Stephen Beaver <sbeaver@netgate.com> | 2015-09-22 12:23:27 -0400 |
|---|---|---|
| committer | Stephen Beaver <sbeaver@netgate.com> | 2015-09-22 12:24:06 -0400 |
| commit | 5c22f8ef690407a3c0b53c28fabfa27d713b6409 (patch) | |
| tree | a457d16984c61b0dc90e6e599155570c74f0f160 /src/etc | |
| parent | e5f88c31fa99a82f65c5c32ca671cf9fa71ed60a (diff) | |
| download | pfsense-5c22f8ef690407a3c0b53c28fabfa27d713b6409.zip pfsense-5c22f8ef690407a3c0b53c28fabfa27d713b6409.tar.gz | |
Unfinished (but better) versions of hte pkg pages and utilities
Diffstat (limited to 'src/etc')
| -rw-r--r-- | src/etc/inc/pkg-utils.inc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/etc/inc/pkg-utils.inc b/src/etc/inc/pkg-utils.inc index a3b5e2a..3e0fd7a 100644 --- a/src/etc/inc/pkg-utils.inc +++ b/src/etc/inc/pkg-utils.inc @@ -232,7 +232,7 @@ function is_pkg_installed($pkg_name) { pkg_remove_prefix($pkg_name); - return pkg_call("info -e " . $g['pkg_prefix'] . $pkg_name, true); + return pkg_call("info " . $g['pkg_prefix'] . $pkg_name, true); } /* Install package, $pkg_name should not contain prefix */ @@ -305,7 +305,7 @@ function get_package_internal_name($package_data) { /* Get information about packages */ function get_pkg_info($pkgs = 'all', $info = 'all') { - global $g, $static_output; + global $g, $static_output, $input_errors; $out = ''; $err = ''; @@ -318,6 +318,7 @@ function get_pkg_info($pkgs = 'all', $info = 'all') { $static_output .= "\n" . gettext("Updating package repository metadada...") . "\n"; update_status($static_output); if (!pkg_call("update")) { + $input_errors[] = gettext("ERROR: An error occurred when updating packages repository. Aborting...") . "\n"; $static_output .= "\n" . gettext("ERROR: An error occurred when updating packages repository. Aborting...") . "\n"; update_status($static_output); return array(); @@ -328,6 +329,8 @@ function get_pkg_info($pkgs = 'all', $info = 'all') { if ($rc != 0) { $static_output .= "\n" . gettext("ERROR: Error trying to get packages list. Aborting...") . "\n"; $static_output .= $err; + $input_errors[] = gettext("ERROR: Error trying to get packages list. Aborting...") . "\n"; + $input_errors[] = $err; update_status($static_output); return array(); } |
