system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-07-21 18:27:22 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix freebsd-update(8) erroneous message and exit status when "fetch install" used.

Browse source 
PR:		190660
Reviewed by:	allanjude
Approved by:	emaste
Differential Revision:	https://reviews.freebsd.org/D12037
This commit is contained in:
Guangyuan Yang 2017-10-09 16:33:37 +00:00
parent 1df04cc069
commit 33bd05c318
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=324441
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
usr.sbin/freebsd-update/freebsd-update.sh
View file

@ -418,6 +418,9 @@ init_params () {
# Run without a TTY
NOTTYOK=0
# Fetched first in a chain of commands
ISFETCHED=0
}
# Parse the command line
@ -783,8 +786,10 @@ install_check_params () {
# Check that we have updates ready to install
if ! [ -L ${BDHASH}-install ]; then
echo "No updates are available to install."
echo "Run '$0 fetch' first."
exit 1
if [ $ISFETCHED -eq 0 ]; then
echo "Run '$0 fetch' first."
fi
exit 0
fi
if ! [ -f ${BDHASH}-install/INDEX-OLD ] ||
! [ -f ${BDHASH}-install/INDEX-NEW ]; then
@ -3241,6 +3246,7 @@ cmd_fetch () {
fi
fetch_check_params
fetch_run || exit 1
ISFETCHED=1
}
# Cron command. Make sure the parameters are sensible; wait