From owner-svn-src-stable-12@freebsd.org Wed Aug 26 17:15:18 2020
Return-Path: <owner-svn-src-stable-12@freebsd.org>
Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.nyi.freebsd.org (Postfix) with ESMTP id 41E4E3B3BB7;
Wed, 26 Aug 2020 17:15:18 +0000 (UTC)
(envelope-from grembo@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4BcCD610qlz4L1f;
Wed, 26 Aug 2020 17:15:18 +0000 (UTC)
(envelope-from grembo@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 071F11664F;
Wed, 26 Aug 2020 17:15:18 +0000 (UTC)
(envelope-from grembo@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07QHFH7k012033;
Wed, 26 Aug 2020 17:15:17 GMT (envelope-from grembo@FreeBSD.org)
Received: (from grembo@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07QHFHG9012032;
Wed, 26 Aug 2020 17:15:17 GMT (envelope-from grembo@FreeBSD.org)
Message-Id: <202008261715.07QHFHG9012032@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: grembo set sender to
grembo@FreeBSD.org using -f
From: Michael Gmelin <grembo@FreeBSD.org>
Date: Wed, 26 Aug 2020 17:15:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject: svn commit: r364826 - stable/12/usr.sbin/freebsd-update
X-SVN-Group: stable-12
X-SVN-Commit-Author: grembo
X-SVN-Commit-Paths: stable/12/usr.sbin/freebsd-update
X-SVN-Commit-Revision: 364826
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-12@freebsd.org
X-Mailman-Version: 2.1.33
Precedence: list
List-Id: SVN commit messages for only the 12-stable src tree
<svn-src-stable-12.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-12>,
<mailto:svn-src-stable-12-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-12/>
List-Post: <mailto:svn-src-stable-12@freebsd.org>
List-Help: <mailto:svn-src-stable-12-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-12>,
<mailto:svn-src-stable-12-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Aug 2020 17:15:18 -0000
Author: grembo (ports committer)
Date: Wed Aug 26 17:15:17 2020
New Revision: 364826
URL: https://svnweb.freebsd.org/changeset/base/364826
Log:
MFC r364396: Unbreak `freebsd-update updatesready'.
The command would only work if PWD happened to be WORKDIR.
Also, exit 1 in case WORKDIR exists, but isn't accessible
by the current user.
PR: 242709
Reported by: Max Fiedler
Modified:
stable/12/usr.sbin/freebsd-update/freebsd-update.sh
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/usr.sbin/freebsd-update/freebsd-update.sh
==============================================================================
--- stable/12/usr.sbin/freebsd-update/freebsd-update.sh Wed Aug 26 17:14:16 2020 (r364825)
+++ stable/12/usr.sbin/freebsd-update/freebsd-update.sh Wed Aug 26 17:15:17 2020 (r364826)
@@ -3341,8 +3341,18 @@ cmd_upgrade () {
upgrade_run || exit 1
}
-# Check if there are fetched updates ready to install
+# Check if there are fetched updates ready to install.
+# Chdir into the working directory.
cmd_updatesready () {
+ # Check if working directory exists (if not, no updates pending)
+ if ! [ -e "${WORKDIR}" ]; then
+ echo "No updates are available to install."
+ exit 2
+ fi
+
+ # Change into working directory (fail if no permission/directory etc.)
+ cd ${WORKDIR} || exit 1
+
# Construct a unique name from ${BASEDIR}
BDHASH=`echo ${BASEDIR} | sha256 -q`