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

Revert "Fix #5831"

Browse Source 
This reverts commit 93a8ddf7a4.
This commit is contained in:
Renato Botelho 2016-02-02 10:35:07 -02:00
parent f362c73bb7
commit 1855c106e5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -382,9 +382,9 @@ pkg_upgrade() {
fi
fi
if [ $(pkg ${pkg_chroot} upgrade -Unq | wc -l) -gt 1 ]; then
if [ $(pkg ${pkg_chroot} upgrade -nq | wc -l) -gt 1 ]; then
_echo "Upgrading necessary packages..."
if ! pkg ${pkg_chroot} upgrade -U 2>&1 | tee -a ${logfile}; then
if ! pkg ${pkg_chroot} upgrade 2>&1 | tee -a ${logfile}; then
pkg ${pkg_chroot} annotate -q -D ${kernel_pkg} next_stage
pkg_unlock "${pkg_prefix}*"
_echo "ERROR: An error occurred when upgrade was running..."
@ -413,9 +413,9 @@ pkg_upgrade() {
fi
if [ "${next_stage}" = "3" ]; then
if [ $(pkg upgrade -Unq | wc -l) -gt 1 ]; then
if [ $(pkg upgrade -nq | wc -l) -gt 1 ]; then
_echo "Upgrading necessary packages..."
if ! pkg ${pkg_chroot} upgrade -U 2>&1 | tee -a ${logfile}; then
if ! pkg ${pkg_chroot} upgrade 2>&1 | tee -a ${logfile}; then
pkg ${pkg_chroot} annotate -q -D ${kernel_pkg} next_stage
_echo "ERROR: An error occurred when upgrade was running..."
_exit 1