From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS22989 209.51.188.0/24 X-Spam-Status: No, score=-3.9 required=3.0 tests=AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id 42C931F461 for ; Wed, 21 Aug 2019 18:44:43 +0000 (UTC) Received: from localhost ([::1]:52314 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0Vb8-0006bs-22 for normalperson@yhbt.net; Wed, 21 Aug 2019 14:44:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43539) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0Vai-0005UN-9q for bug-gnulib@gnu.org; Wed, 21 Aug 2019 14:44:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0Vag-00071F-FM for bug-gnulib@gnu.org; Wed, 21 Aug 2019 14:44:15 -0400 Received: from zimbra.cs.ucla.edu ([131.179.128.68]:42952) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i0Vag-000714-5T for bug-gnulib@gnu.org; Wed, 21 Aug 2019 14:44:14 -0400 Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 043271626D4; Wed, 21 Aug 2019 11:44:13 -0700 (PDT) Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id EdjHjR_cTgDX; Wed, 21 Aug 2019 11:44:12 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 1332A1626E5; Wed, 21 Aug 2019 11:44:12 -0700 (PDT) X-Virus-Scanned: amavisd-new at zimbra.cs.ucla.edu Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id LmWvBAUmG9Iw; Wed, 21 Aug 2019 11:44:11 -0700 (PDT) Received: from [192.168.1.9] (cpe-23-242-74-103.socal.res.rr.com [23.242.74.103]) by zimbra.cs.ucla.edu (Postfix) with ESMTPSA id D8ED61626D4; Wed, 21 Aug 2019 11:44:11 -0700 (PDT) Subject: Re: allow trailing ws in standards/maintain.texi To: Karl Berry References: <201908211514.x7LFEGd1026282@freefriends.org> From: Paul Eggert Organization: UCLA Computer Science Department Message-ID: Date: Wed, 21 Aug 2019 11:44:11 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 In-Reply-To: <201908211514.x7LFEGd1026282@freefriends.org> Content-Type: multipart/mixed; boundary="------------31E3510962F6B29178D1138C" Content-Language: en-US X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 131.179.128.68 X-BeenThere: bug-gnulib@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Gnulib discussion list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: bug-gnulib@gnu.org Errors-To: bug-gnulib-bounces+normalperson=yhbt.net@gnu.org Sender: "bug-gnulib" This is a multi-part message in MIME format. --------------31E3510962F6B29178D1138C Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Karl Berry wrote: > [Ping? Anyone there?] I don't think I have the bits to fiddle with commit hooks on Savannah. However, this problem isn't limited to Savannah; it could happen to any downstream project that uses these files and has similar commit hooks. All things considered I suspect it's better just to trim the trailing white space in the Gnulib copy. Of course the upstream version should be trimmed too but (as we see here) that's not always easy. I installed the attached patch and did an autoupdate. While I was at it, I configured srclist.txt to strip trailing white space from texinfo.tex too, as I recall that being an issue in the past (don't recall where). --------------31E3510962F6B29178D1138C Content-Type: text/x-patch; name="0001-New-strip-trailing-space-option-for-srclist-update.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename*0="0001-New-strip-trailing-space-option-for-srclist-update.patc"; filename*1="h" >From 63bd32fd4232cb916a683cecebf954e678360aec Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 21 Aug 2019 11:30:10 -0700 Subject: [PATCH] New strip-trailing-space option for srclist-update * config/srclist-update (fixfile): Support new option. * config/srclist.txt (texinfo.tex, maintain.texi, standards.texi): Use it. --- ChangeLog | 7 +++++++ config/srclist-update | 10 ++++++++-- config/srclist.txt | 6 +++--- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index f5eda2fa3..d76da745b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2019-08-21 Paul Eggert + + New strip-trailing-space option for srclist-update + * config/srclist-update (fixfile): Support new option. + * config/srclist.txt (texinfo.tex, maintain.texi, standards.texi): + Use it. + 2019-08-20 Eric Blake accept4: Support SOCK_NONBLOCK, if defined diff --git a/config/srclist-update b/config/srclist-update index b90ef1544..e57ba4eaf 100755 --- a/config/srclist-update +++ b/config/srclist-update @@ -14,6 +14,7 @@ # options. # The possible options are "gpl" (to replace the license with the GPL) # and "doclicense" (to replace @include doclicense.texi with fdl.texi) +# and "strip-trailing-space" (to strip trailing white space from lines) # and "release" (to use the release version instead of the # development version). # Unrecognized options are ignored. @@ -91,8 +92,8 @@ fixlicense=' # Quote the $ so that CVS does not expand it in this script. remove_id_lines='/[$]Id:.*[$]/d' -# $1 is the root directory of input file, $2 is input file, $3 is -# output. Remove $Id lines, since they'll differ between source +# $1 is input file, $2 is output. +# Remove $Id lines, since they'll differ between source # locations. If $options contains "gpl", change the license to be the # standard GPL. We use this for libc files, et al. # @@ -100,6 +101,11 @@ fixfile() \ { sed_command="$remove_id_lines" + case " $options " in + *' strip-trailing-space '*) + sed_command="$sed_command; s/[[:space:]]*\$//";; + esac + case " $options " in *' gpl '*) sed_command="$sed_command; $fixlicense";; diff --git a/config/srclist.txt b/config/srclist.txt index bb6ad87ab..6d37729ce 100644 --- a/config/srclist.txt +++ b/config/srclist.txt @@ -12,13 +12,13 @@ $AUTOMAKE lib/install-sh build-aux $AUTOMAKE lib/mdate-sh build-aux $AUTOMAKE lib/mkinstalldirs build-aux -$TEXINFOTEX texinfo.tex build-aux +$TEXINFOTEX texinfo.tex build-aux strip-trailing-space # we generate INSTALL from this via a rule in doc/Makefile. $AUTOCONF doc/install.texi doc -$GNUSTANDARDS maintain.texi doc -$GNUSTANDARDS standards.texi doc +$GNUSTANDARDS maintain.texi doc strip-trailing-space +$GNUSTANDARDS standards.texi doc strip-trailing-space $GNUSTANDARDS make-stds.texi doc $GNUSTANDARDS gnu-oids.texi doc $GNUSTANDARDS fdl.texi doc -- 2.17.1 --------------31E3510962F6B29178D1138C--