svn commit: r330985 - stable/11/usr.sbin/freebsd-update

[Eitan Adler]

Author: eadler
Date: Thu Mar 15 10:13:25 2018
New Revision: 330985
URL: https://svnweb.freebsd.org/changeset/base/330985

Log:
  MFC r324441:
  
  Fix freebsd-update(8) erroneous message and exit status when "fetch install" used.
  
  PR:		190660

Modified:
  stable/11/usr.sbin/freebsd-update/freebsd-update.sh
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/usr.sbin/freebsd-update/freebsd-update.sh
==============================================================================
--- stable/11/usr.sbin/freebsd-update/freebsd-update.sh	Thu Mar 15 10:01:11 2018	(r330984)
+++ stable/11/usr.sbin/freebsd-update/freebsd-update.sh	Thu Mar 15 10:13:25 2018	(r330985)
@@ -420,6 +420,9 @@ init_params () {
 
 	# Run without a TTY
 	NOTTYOK=0
+
+	# Fetched first in a chain of commands
+	ISFETCHED=0
 }
 
 # Parse the command line
@@ -785,8 +788,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
@@ -3243,6 +3248,7 @@ cmd_fetch () {
 	fi
 	fetch_check_params
 	fetch_run || exit 1
+	ISFETCHED=1
 }
 
 # Cron command.  Make sure the parameters are sensible; wait