From owner-svn-src-stable@freebsd.org Thu Mar 15 10:13:26 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3615CF2D733; Thu, 15 Mar 2018 10:13:26 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id DB0FB78E2A; Thu, 15 Mar 2018 10:13:25 +0000 (UTC) (envelope-from eadler@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D539714D63; Thu, 15 Mar 2018 10:13:25 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2FADPI1085478; Thu, 15 Mar 2018 10:13:25 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2FADPDh085477; Thu, 15 Mar 2018 10:13:25 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201803151013.w2FADPDh085477@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Thu, 15 Mar 2018 10:13:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r330985 - stable/11/usr.sbin/freebsd-update X-SVN-Group: stable-11 X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: stable/11/usr.sbin/freebsd-update X-SVN-Commit-Revision: 330985 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2018 10:13:26 -0000 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