mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-28 14:22:50 +03:00
* Move ensureDir() up, otherwise calls to fail() might fail.
svn path=/nixpkgs/trunk/; revision=3192
This commit is contained in:
parent
aa05801439
commit
32d7a746a2
@ -37,6 +37,13 @@ if test -f $NIX_GCC/nix-support/setup-hook; then
|
||||
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,
|
||||
# create the file `$out/nix-support/failed' to signal failure, and
|
||||
# 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
|
||||
# that writes the specified file (and also to our original stdout).
|
||||
# The original stdout is saved in descriptor 3.
|
||||
|
Loading…
Reference in New Issue
Block a user