From owner-dev-commits-src-all@freebsd.org Tue Apr 20 20:23:37 2021 Return-Path: Delivered-To: dev-commits-src-all@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 8E6AD5E7A14; Tue, 20 Apr 2021 20:23:37 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FPwB12j4Gz3hYf; Tue, 20 Apr 2021 20:23:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2F9FA19423; Tue, 20 Apr 2021 20:23:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13KKNbga004275; Tue, 20 Apr 2021 20:23:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13KKNbPR004274; Tue, 20 Apr 2021 20:23:37 GMT (envelope-from git) Date: Tue, 20 Apr 2021 20:23:37 GMT Message-Id: <202104202023.13KKNbPR004274@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: ada7fd17d57f - main - etcupdate: Trim trailing whitespace. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ada7fd17d57fac3dbafff5a1b3268afb872c8b0b Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Apr 2021 20:23:37 -0000 The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=ada7fd17d57fac3dbafff5a1b3268afb872c8b0b commit ada7fd17d57fac3dbafff5a1b3268afb872c8b0b Author: John Baldwin AuthorDate: 2021-04-20 20:22:24 +0000 Commit: John Baldwin CommitDate: 2021-04-20 20:22:24 +0000 etcupdate: Trim trailing whitespace. Reviewed by: imp MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D29845 --- usr.sbin/etcupdate/etcupdate.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.sbin/etcupdate/etcupdate.sh b/usr.sbin/etcupdate/etcupdate.sh index d0c27805562e..2b14b3a4d71b 100755 --- a/usr.sbin/etcupdate/etcupdate.sh +++ b/usr.sbin/etcupdate/etcupdate.sh @@ -442,7 +442,7 @@ empty_destdir() # # $1 - first tree # $2 - second tree -# $3 - node name +# $3 - node name # $4 - label for first tree # $5 - label for second tree diffnode() @@ -867,7 +867,7 @@ merge_file() # $1 - pathname of the file to resolve (relative to DESTDIR) has_conflicts() { - + egrep -q '^(<{7}|\|{7}|={7}|>{7}) ' $CONFLICTS/$1 } @@ -1526,7 +1526,7 @@ EOF if [ -n "$preworld" ]; then > $WORKDIR/removed.files fi - + # The order for the following sections is important. In the # odd case that a directory is converted into a file, the # existing subfiles need to be removed if possible before the