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

Make sure repo metadata is updated before any other package when repo conf changes. Fixes #6052

Browse Source 
(cherry picked from commit 78aee67a9e)
This commit is contained in:
Renato Botelho 2016-04-04 12:15:01 -03:00
parent f14ec73c66
commit ebefc6a84b
1 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/usr/local/sbin/pfSense-upgrade
View File

@ -292,6 +292,29 @@ pkg_upgrade() {
pkg_update force
fi
if is_pkg_installed ${product}-repo-devel; then
local _repo_pkg="${product}-repo-devel"
else
local _repo_pkg="${product}-repo"
fi
if [ "$(compare_pkg_version ${_repo_pkg})" = "<" ]; then
cp /usr/local/etc/pkg/repos/${product}.conf \
/tmp/${product}.conf.copy
_exec "pkg upgrade ${_repo_pkg}" "Upgrading ${_repo_pkg}" mute
# If conf differs, for an update
if ! cmp -s /usr/local/etc/pkg/repos/${product}.conf /tmp/${product}.conf.copy; then
pkg_update force
# New repo may contain newer pkg
if [ "$(compare_pkg_version pkg)" = "<" ]; then
_exec "pkg upgrade pkg" "Upgrading pkg" mute
pkg_update force
fi
fi
rm -f /tmp/${product}.conf.copy
fi
if [ $(pkg upgrade -nq | wc -l) -le 1 ]; then
_echo "Your packages are up to date"
_exit 0