From owner-svn-src-head@freebsd.org  Mon Oct  9 16:33:38 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 985F3E359F0;
 Mon,  9 Oct 2017 16:33:38 +0000 (UTC) (envelope-from ygy@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1C5B6679BD;
 Mon,  9 Oct 2017 16:33:38 +0000 (UTC) (envelope-from ygy@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v99GXbaX067582;
 Mon, 9 Oct 2017 16:33:37 GMT (envelope-from ygy@FreeBSD.org)
Received: (from ygy@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v99GXbmK067581;
 Mon, 9 Oct 2017 16:33:37 GMT (envelope-from ygy@FreeBSD.org)
Message-Id: <201710091633.v99GXbmK067581@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ygy set sender to ygy@FreeBSD.org
 using -f
From: Guangyuan Yang <ygy@FreeBSD.org>
Date: Mon, 9 Oct 2017 16:33:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r324441 - head/usr.sbin/freebsd-update
X-SVN-Group: head
X-SVN-Commit-Author: ygy
X-SVN-Commit-Paths: head/usr.sbin/freebsd-update
X-SVN-Commit-Revision: 324441
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Oct 2017 16:33:38 -0000

Author: ygy (doc committer)
Date: Mon Oct  9 16:33:37 2017
New Revision: 324441
URL: https://svnweb.freebsd.org/changeset/base/324441

Log:
  Fix freebsd-update(8) erroneous message and exit status when "fetch install" used.
  
  PR:		190660
  Reviewed by:	allanjude
  Approved by:	emaste
  Differential Revision:	https://reviews.freebsd.org/D12037

Modified:
  head/usr.sbin/freebsd-update/freebsd-update.sh

Modified: head/usr.sbin/freebsd-update/freebsd-update.sh
==============================================================================
--- head/usr.sbin/freebsd-update/freebsd-update.sh	Mon Oct  9 16:27:31 2017	(r324440)
+++ head/usr.sbin/freebsd-update/freebsd-update.sh	Mon Oct  9 16:33:37 2017	(r324441)
@@ -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