* Re: master 83a6224: make-dist: check exit statuses more carefully
[not found] ` <20180409203521.3506A20450@vcs0.savannah.gnu.org>
@ 2018-04-10 9:04 ` Robert Pluim
2018-04-12 0:19 ` Paul Eggert
2018-04-11 19:40 ` Glenn Morris
1 sibling, 1 reply; 5+ messages in thread
From: Robert Pluim @ 2018-04-10 9:04 UTC (permalink / raw)
To: emacs-devel; +Cc: Paul Eggert
eggert@cs.ucla.edu (Paul Eggert) writes:
> branch: master
> commit 83a6224d607c645cadbe371c921928166da0aef0
> Author: Paul Eggert <eggert@cs.ucla.edu>
> Commit: Paul Eggert <eggert@cs.ucla.edu>
>
> make-dist: check exit statuses more carefully
>
> * make-dist: Do a better job checking for subprocess failure.
Would 'set -e' not be easier?
Robert
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: master 83a6224: make-dist: check exit statuses more carefully
[not found] ` <20180409203521.3506A20450@vcs0.savannah.gnu.org>
2018-04-10 9:04 ` master 83a6224: make-dist: check exit statuses more carefully Robert Pluim
@ 2018-04-11 19:40 ` Glenn Morris
2018-04-12 0:07 ` Paul Eggert
1 sibling, 1 reply; 5+ messages in thread
From: Glenn Morris @ 2018-04-11 19:40 UTC (permalink / raw)
To: emacs-devel; +Cc: Paul Eggert
Paul Eggert wrote:
> branch: master
> commit 83a6224d607c645cadbe371c921928166da0aef0
[...]
> make-dist: check exit statuses more carefully
This breaks eg ./make-dist --no-update --tar --no-check.
Ref eg https://hydra.nixos.org/build/72642760
(There's no need for ChangeLog to exist in that usage.)
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: master 83a6224: make-dist: check exit statuses more carefully
2018-04-11 19:40 ` Glenn Morris
@ 2018-04-12 0:07 ` Paul Eggert
0 siblings, 0 replies; 5+ messages in thread
From: Paul Eggert @ 2018-04-12 0:07 UTC (permalink / raw)
To: Glenn Morris, emacs-devel
[-- Attachment #1: Type: text/plain, Size: 229 bytes --]
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.
[-- Attachment #2: 0001-make-dist-fix-bug-with-top-level-ChangeLog.patch --]
[-- Type: text/x-patch, Size: 1510 bytes --]
From acdcd58ed1b73384c6a77f26b1a5c6b070ea3eed Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: master 83a6224: make-dist: check exit statuses more carefully
2018-04-10 9:04 ` master 83a6224: make-dist: check exit statuses more carefully Robert Pluim
@ 2018-04-12 0:19 ` Paul Eggert
2018-04-12 8:07 ` Robert Pluim
0 siblings, 1 reply; 5+ messages in thread
From: Paul Eggert @ 2018-04-12 0:19 UTC (permalink / raw)
To: Robert Pluim, emacs-devel
On 04/10/2018 02:04 AM, Robert Pluim wrote:
> Would 'set -e' not be easier?
I've never trusted 'set -e' for anything other than simpleminded
debugging, because set -e is a global setting (so it's inflexible) and
it doesn't always work (so it's unreliable). For an example of the latter:
set -e; { false; true; } && echo x
This succeeds and outputs "x" even though the "false" command failed.
(POSIX requires this and it's longstanding behavior.)
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: master 83a6224: make-dist: check exit statuses more carefully
2018-04-12 0:19 ` Paul Eggert
@ 2018-04-12 8:07 ` Robert Pluim
0 siblings, 0 replies; 5+ messages in thread
From: Robert Pluim @ 2018-04-12 8:07 UTC (permalink / raw)
To: Paul Eggert; +Cc: emacs-devel
Paul Eggert <eggert@cs.ucla.edu> writes:
> On 04/10/2018 02:04 AM, Robert Pluim wrote:
>> Would 'set -e' not be easier?
>
> I've never trusted 'set -e' for anything other than simpleminded
> debugging, because set -e is a global setting (so it's inflexible) and
> it doesn't always work (so it's unreliable). For an example of the
> latter:
>
> set -e; { false; true; } && echo x
>
> This succeeds and outputs "x" even though the "false" command
> failed. (POSIX requires this and it's longstanding behavior.)
Youʼre right. POSIX isnʼt even ambiguous about it.
Robert
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-04-12 8:07 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20180409203519.16812.87351@vcs0.savannah.gnu.org>
[not found] ` <20180409203521.3506A20450@vcs0.savannah.gnu.org>
2018-04-10 9:04 ` master 83a6224: make-dist: check exit statuses more carefully Robert Pluim
2018-04-12 0:19 ` Paul Eggert
2018-04-12 8:07 ` Robert Pluim
2018-04-11 19:40 ` Glenn Morris
2018-04-12 0:07 ` Paul Eggert
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.