public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Move ensureDir() up, otherwise calls to fail() might fail.

Browse Source 
svn path=/nixpkgs/trunk/; revision=3192
This commit is contained in:
Eelco Dolstra 2005-06-17 11:42:53 +00:00
parent aa05801439
commit 32d7a746a2
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/stdenv/generic/setup.sh
View File

@ -37,6 +37,13 @@ if test -f $NIX_GCC/nix-support/setup-hook; then
fi fi
# Ensure that the given directory exists.
ensureDir() {
local dir=$1
if ! test -x "$dir"; then mkdir -p "$dir"; fi
}
# Called when some build action fails. If $succeedOnFailure is set, # Called when some build action fails. If $succeedOnFailure is set,
# create the file `$out/nix-support/failed' to signal failure, and # create the file `$out/nix-support/failed' to signal failure, and
# exit normally. Otherwise, exit with failure. # exit normally. Otherwise, exit with failure.
@ -208,13 +215,6 @@ dumpVars() {
} }
# Ensure that the given directory exists.
ensureDir() {
local dir=$1
if ! test -x "$dir"; then mkdir -p "$dir"; fi
}
# Redirect stdout/stderr to a named pipe connected to a `tee' process # Redirect stdout/stderr to a named pipe connected to a `tee' process
# that writes the specified file (and also to our original stdout). # that writes the specified file (and also to our original stdout).
# The original stdout is saved in descriptor 3. # The original stdout is saved in descriptor 3.