diff options
| author | Stephen Beaver <sbeaver@netgate.com> | 2016-05-07 13:42:01 -0400 |
|---|---|---|
| committer | Stephen Beaver <sbeaver@netgate.com> | 2016-05-07 13:43:32 -0400 |
| commit | 413a52a0e216a89da1ed73536156c0307a4af26e (patch) | |
| tree | 4082d3e029854952b45712a367bd5b84d383f17c /src/etc | |
| parent | 5cfd54928ff3c0b552c80b0cb428dd3c73edf70a (diff) | |
| download | pfsense-413a52a0e216a89da1ed73536156c0307a4af26e.zip pfsense-413a52a0e216a89da1ed73536156c0307a4af26e.tar.gz | |
Workaound fixes #6320
(cherry picked from commit d1c57eb8e1699f36a3ccda53cef2e28b10eeca92)
Diffstat (limited to 'src/etc')
| -rw-r--r-- | src/etc/inc/pkg-utils.inc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/etc/inc/pkg-utils.inc b/src/etc/inc/pkg-utils.inc index 0857fb0..a8f35f0 100644 --- a/src/etc/inc/pkg-utils.inc +++ b/src/etc/inc/pkg-utils.inc @@ -1115,7 +1115,7 @@ function get_base_pkg_name() { } /* Verify if system needs upgrade (meta package or base) */ -function get_system_pkg_version() { +function get_system_pkg_version($baseonly = false) { global $g; $base_pkg = get_base_pkg_name(); @@ -1135,8 +1135,7 @@ function get_system_pkg_version() { } } - if (empty($pkg_info) || - $pkg_info['version'] == $pkg_info['installed_version']) { + if (empty($pkg_info) || (!$baseonly && ($pkg_info['version'] == $pkg_info['installed_version']))) { $info = get_pkg_info($meta_pkg); $pkg_name = $meta_pkg; |
