From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Paul Eggert Newsgroups: gmane.emacs.devel Subject: Re: master 83a6224: make-dist: check exit statuses more carefully Date: Wed, 11 Apr 2018 17:07:00 -0700 Organization: UCLA Computer Science Department Message-ID: <56a99628-1de2-2ef3-a2e4-faef9c804fba@cs.ucla.edu> References: <20180409203519.16812.87351@vcs0.savannah.gnu.org> <20180409203521.3506A20450@vcs0.savannah.gnu.org> <8vtvshy1jo.fsf@fencepost.gnu.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------F90B1CBBB9ECC6A60C9FB16E" X-Trace: blaine.gmane.org 1523491546 32630 195.159.176.226 (12 Apr 2018 00:05:46 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Thu, 12 Apr 2018 00:05:46 +0000 (UTC) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 To: Glenn Morris , emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Apr 12 02:05:42 2018 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1f6PkA-0008JL-LR for ged-emacs-devel@m.gmane.org; Thu, 12 Apr 2018 02:05:38 +0200 Original-Received: from localhost ([::1]:42035 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f6PmH-0002Cd-8Q for ged-emacs-devel@m.gmane.org; Wed, 11 Apr 2018 20:07:49 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:49658) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f6Plc-0002C5-Py for emacs-devel@gnu.org; Wed, 11 Apr 2018 20:07:09 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f6PlZ-00015e-L6 for emacs-devel@gnu.org; Wed, 11 Apr 2018 20:07:08 -0400 Original-Received: from zimbra.cs.ucla.edu ([131.179.128.68]:47054) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1f6PlZ-00014Y-Ex; Wed, 11 Apr 2018 20:07:05 -0400 Original-Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id C5FE016161E; Wed, 11 Apr 2018 17:07:03 -0700 (PDT) Original-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 4t0-InbktIbs; Wed, 11 Apr 2018 17:07:00 -0700 (PDT) Original-Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 7DE0B161631; Wed, 11 Apr 2018 17:07:00 -0700 (PDT) X-Virus-Scanned: amavisd-new at zimbra.cs.ucla.edu Original-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 HpFX-UXBK5bJ; Wed, 11 Apr 2018 17:07:00 -0700 (PDT) Original-Received: from Penguin.CS.UCLA.EDU (Penguin.CS.UCLA.EDU [131.179.64.200]) by zimbra.cs.ucla.edu (Postfix) with ESMTPSA id 60B3316161E; Wed, 11 Apr 2018 17:07:00 -0700 (PDT) In-Reply-To: <8vtvshy1jo.fsf@fencepost.gnu.org> Content-Language: en-US X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 131.179.128.68 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:224521 Archived-At: This is a multi-part message in MIME format. --------------F90B1CBBB9ECC6A60C9FB16E Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit On 04/11/2018 12:40 PM, Glenn Morris wrote: > This breaks eg ./make-dist --no-update --tar --no-check. > Ref eghttps://hydra.nixos.org/build/72642760 Thanks for mentioning that. I installed the attached, which should fix this. --------------F90B1CBBB9ECC6A60C9FB16E Content-Type: text/x-patch; name="0001-make-dist-fix-bug-with-top-level-ChangeLog.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0001-make-dist-fix-bug-with-top-level-ChangeLog.patch" >From acdcd58ed1b73384c6a77f26b1a5c6b070ea3eed Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 11 Apr 2018 17:03:43 -0700 Subject: [PATCH] make-dist: fix bug with top-level ChangeLog Problem reported by Glenn Morris in: https://lists.gnu.org/r/emacs-devel/2018-04/msg00307.html * make-dist (top_level_ChangeLog): New var. Use it to link top-level ChangeLog only when desired. --- make-dist | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/make-dist b/make-dist index 7fd227862b..4f420a9748 100755 --- a/make-dist +++ b/make-dist @@ -358,12 +358,14 @@ tempdir= echo "Creating top directory: '${tempdir}'" mkdir ${tempdir} || exit +top_level_ChangeLog= if [ "$changelog" = yes ]; then if test -r .git; then ## When making a release or pretest the ChangeLog should already ## have been created and edited as needed. Don't ignore it. if test -r ChangeLog; then echo "Using existing top-level ChangeLog" + top_level_ChangeLog=ChangeLog else echo "Making top-level ChangeLog" make ChangeLog CHANGELOG=${tempdir}/ChangeLog || \ @@ -383,9 +385,9 @@ top_level= INSTALL README BUGS ChangeLog.*[0-9] Makefile.in autogen.sh configure configure.ac config.bat make-dist .dir-locals.el - aclocal.m4 CONTRIBUTE ChangeLog + aclocal.m4 CONTRIBUTE ' -ln $top_level $tempdir || exit +ln $top_level $top_level_ChangeLog $tempdir || exit echo "Creating subdirectories" for subdir in site-lisp \ -- 2.14.3 --------------F90B1CBBB9ECC6A60C9FB16E--