Date: Wed, 9 Jun 2021 21:21:07 GMT From: John Baldwin <jhb@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: ea6546fa1dd4 - stable/12 - etcupdate: Trim trailing whitespace. Message-ID: <202106092121.159LL7Mq051707@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/12 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=ea6546fa1dd4fad52421585ebbfce56a07d8284d commit ea6546fa1dd4fad52421585ebbfce56a07d8284d Author: John Baldwin <jhb@FreeBSD.org> AuthorDate: 2021-04-20 20:22:24 +0000 Commit: John Baldwin <jhb@FreeBSD.org> CommitDate: 2021-06-09 21:19:19 +0000 etcupdate: Trim trailing whitespace. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D29845 (cherry picked from commit ada7fd17d57fac3dbafff5a1b3268afb872c8b0b) --- 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 f64e58e4ecd1..28f6cbb42aff 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202106092121.159LL7Mq051707>