diff options
| author | rillig <rillig@pkgsrc.org> | 2009-05-28 20:25:35 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2009-05-28 20:25:35 +0000 |
| commit | 8e4dd7eb06006ab4627eb5702354ad91dabc6341 (patch) | |
| tree | b686cf99fbf730336e1dd6e4c75eee4af0e4de0e /bootstrap | |
| parent | 2bb7bf6b1c281ee106392eed5224ac108f45fc6a (diff) | |
| download | pkgsrc-8e4dd7eb06006ab4627eb5702354ad91dabc6341.tar.gz | |
Replaced the weird-looking and probably wrong code in mkdir_p_early with
much simpler code. This works around an endless recursion (and a
segmentation fault when using bash) when ./bootstrap is run in a
read-only directory.
Diffstat (limited to 'bootstrap')
| -rwxr-xr-x | bootstrap/bootstrap | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/bootstrap/bootstrap b/bootstrap/bootstrap index 4c2f7867cf0..682a70ebd3f 100755 --- a/bootstrap/bootstrap +++ b/bootstrap/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh -# $NetBSD: bootstrap,v 1.144 2009/04/23 00:15:53 minskim Exp $ +# $NetBSD: bootstrap,v 1.145 2009/05/28 20:25:35 rillig Exp $ # # # Copyright (c) 2001-2002 Alistair G. Crooks. All rights reserved. @@ -282,14 +282,10 @@ mkdir_p() mkdir_p_early() { - [ -d "$1" ] && return 0 - mkdir -p "$1" 2> /dev/null && return 0 - mkdir_p_early `basename "$1"` - if [ ! -d "$1" ] && mkdir "$1"; then - echo_msg "mkdir $1 exited with status $?" - die "aborted." - fi - return 0 + [ -d "$1" ] && return 0 + mkdir -p "$1" && return 0 + [ -d "$1" ] && return 0 + die "aborted." } copy_src() |