mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #7257: Use pfSense-upgrade to look for new versions

Browse Source
This commit is contained in:
Renato Botelho 2017-02-14 08:26:31 -02:00
parent eb5bc42b04
commit d7a437ce4f
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/etc/inc/pkg-utils.inc
View File

@ -1173,6 +1173,14 @@ function get_base_pkg_name() {
function get_system_pkg_version($baseonly = false) {
global $g;
$output = exec("/usr/local/sbin/{$g['product_name']}-upgrade -c", $_gc,
$rc);
/* pfSense-upgrade returns 2 when there is a new version */
if ($rc == 2) {
$new_version = explode(' ', $output)[0];
}
$base_pkg = get_base_pkg_name();
$meta_pkg = get_meta_pkg_name();
@ -1180,23 +1188,24 @@ function get_system_pkg_version($baseonly = false) {
return false;
}
$info = get_pkg_info($base_pkg);
$pkg_name = $base_pkg;
$info = get_pkg_info($base_pkg, true);
$pkg_info = array();
foreach ($info as $item) {
if ($item['name'] == $base_pkg) {
$pkg_info = $item;
break;
}
}
if (empty($pkg_info) || (!$baseonly && ($pkg_info['version'] == $pkg_info['installed_version']))) {
$info = get_pkg_info($meta_pkg);
$pkg_name = $meta_pkg;
if (empty($pkg_info) || (!$baseonly && ($pkg_info['version'] ==
$pkg_info['installed_version']))) {
$info = get_pkg_info($meta_pkg, true);
foreach ($info as $item) {
if ($item['name'] == $meta_pkg) {
$pkg_info = $item;
break;
}
}
}
@ -1206,8 +1215,7 @@ function get_system_pkg_version($baseonly = false) {
}
return array(
'pkg_name' => $pkg_name,
'version' => $pkg_info['version'],
'version' => $new_version ?: $pkg_info['version'],
'installed_version' => $pkg_info['installed_version']
);
}